Merge remote-tracking branch 'origin/main' into de/zen-service-command

3 files changed, 19 insertions, 0 deletions

diff --git a/src/zenutil/include/zenutil/buildstorage.h b/src/zenutil/include/zenutil/buildstorage.h
index f49d4b42a..46ecd0a11 100644
--- a/src/zenutil/include/zenutil/buildstorage.h
+++ b/src/zenutil/include/zenutil/buildstorage.h
@@ -21,6 +21,9 @@ public:
 		std::atomic<uint64_t> TotalRequestCount	   = 0;
 		std::atomic<uint64_t> TotalRequestTimeUs   = 0;
 		std::atomic<uint64_t> TotalExecutionTimeUs = 0;
+		std::atomic<uint64_t> PeakSentBytes		   = 0;
+		std::atomic<uint64_t> PeakReceivedBytes	   = 0;
+		std::atomic<uint64_t> PeakBytesPerSec	   = 0;
 	};
 
 	virtual ~BuildStorage() {}
diff --git a/src/zenutil/include/zenutil/buildstoragecache.h b/src/zenutil/include/zenutil/buildstoragecache.h
index e1fb73fd4..a0690a16a 100644
--- a/src/zenutil/include/zenutil/buildstoragecache.h
+++ b/src/zenutil/include/zenutil/buildstoragecache.h
@@ -22,6 +22,9 @@ public:
 		std::atomic<uint64_t> TotalRequestCount	   = 0;
 		std::atomic<uint64_t> TotalRequestTimeUs   = 0;
 		std::atomic<uint64_t> TotalExecutionTimeUs = 0;
+		std::atomic<uint64_t> PeakSentBytes		   = 0;
+		std::atomic<uint64_t> PeakReceivedBytes	   = 0;
+		std::atomic<uint64_t> PeakBytesPerSec	   = 0;
 	};
 
 	virtual ~BuildStorageCache() {}
diff --git a/src/zenutil/include/zenutil/wildcard.h b/src/zenutil/include/zenutil/wildcard.h
new file mode 100644
index 000000000..9f402e100
--- /dev/null
+++ b/src/zenutil/include/zenutil/wildcard.h
@@ -0,0 +1,13 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+
+#pragma once
+
+#include <string_view>
+
+namespace zen {
+
+bool MatchWildcard(std::string_view Wildcard, std::string_view String, bool CaseSensitive);
+
+void wildcard_forcelink();	// internal
+
+}  // namespace zen