Auxiliary Test Data Repository + Common Test Utils

ETLTrimmer/main.cpp

@@ -134,6 +134,7 @@ class EventCallback : public ITraceEventCallback
     // analysis stats
     int eventCount_ = 0;
     int keepCount_ = 0;
+    int metadataEventCount_ = 0;
     std::optional<uint64_t> firstTimestamp_;
     uint64_t lastTimestamp_ = 0;
     std::unordered_map<uint32_t, uint64_t> eventCountByProcess_;
@@ -218,6 +219,9 @@ class EventCallback : public ITraceEventCallback
         }
         lastTimestamp_ = ts;
         eventCount_++;
+        if (hdr.ProviderId == Microsoft_Windows_EventMetadata::GUID) {
+            metadataEventCount_++;
+        }
         bool canDiscard = true;
         if (trimRangeQpc_) {
             // tail events always discardable
@@ -278,6 +282,10 @@ class EventCallback : public ITraceEventCallback
     {
         trimRangeMs_ = range;
     }
+    int GetMetadataEventCount() const
+    {
+        return metadataEventCount_;
+    }
     int GetKeepCount() const
     {
         return keepCount_;
@@ -416,6 +424,7 @@ int main(int argc, const char** argv)
     const auto dur = tsr.second - tsr.first;
     std::cout << std::format(" ======== Report for [ {} ] ========\n", *opt.inputFile);
     std::cout << std::format("Total event count: {:L}\n", pCallbackProcessor->GetEventCount());
+    std::cout << std::format("Metadata event count: {:L}\n", pCallbackProcessor->GetMetadataEventCount());
     std::cout << std::format("Timestamp range {:L} - {:L} (duration: {:L})\n", tsr.first, tsr.second, dur);
     std::cout << std::format("Duration of trace in milliseconds: {:L}\n\n", double(dur) / 10'000.);
 

IntelPresentMon/AppCef/source/util/LogSetup.cpp

@@ -166,7 +166,7 @@ namespace p2c::client::util
 			try {
 				const auto fullPipeName = R"(\\.\pipe\)" + pipePrefix;
 				// wait maximum 1.5sec for pipe to be created
-				if (!pipe::DuplexPipe::WaitForAvailability(fullPipeName, 1500)) {
+				if (!pipe::DuplexPipe::WaitForAvailability(fullPipeName, 1500, true)) {
 					pmlog_warn(std::format("Failed to connect to logging source server {} after waiting 1.5s", pipePrefix));
 					return;
 				}

IntelPresentMon/CommonUtilities/pipe/Pipe.cpp

@@ -73,8 +73,9 @@ namespace pmon::util::pipe
 	{
 		return writeBuf_.consume(GetWriteBufferPending());
 	}
-	bool DuplexPipe::WaitForAvailability(const std::string& name, uint32_t timeoutMs, uint32_t pollPeriodMs)
+	bool DuplexPipe::WaitForAvailability(const std::string& baseName, uint32_t timeoutMs, bool noSuffix, uint32_t pollPeriodMs)
 	{
+		const auto name = baseName + (noSuffix ? "" : "-in");
 		const auto start = std::chrono::high_resolution_clock::now();
 		while (std::chrono::high_resolution_clock::now() - start < 1ms * timeoutMs) {
 			if (WaitNamedPipeA(name.c_str(), 0)) {
@@ -86,6 +87,22 @@ namespace pmon::util::pipe
 		}
 		return false;
 	}
+	bool DuplexPipe::WaitForVacancy(const std::string& baseName, uint32_t timeoutMs, bool noSuffix, uint32_t pollPeriodMs)
+	{
+		const auto name = baseName + (noSuffix ? "" : "-out");
+		const auto start = std::chrono::high_resolution_clock::now();
+		while (std::chrono::high_resolution_clock::now() - start < 1ms * timeoutMs) {
+			if (!WaitNamedPipeA(name.c_str(), 0)) {
+				const DWORD err = GetLastError();
+				if (err == ERROR_FILE_NOT_FOUND) {
+					return true; // Vacant: no pipe instances exist.
+				}
+			}
+			std::this_thread::sleep_for(1ms * pollPeriodMs);
+		}
+		return false;
+	}
+
 	uint32_t DuplexPipe::GetId() const
 	{
 		return uid_;

IntelPresentMon/CommonUtilities/pipe/Pipe.h

@@ -102,7 +102,8 @@ namespace pmon::util::pipe
 		}
 		size_t GetWriteBufferPending() const;
 		void ClearWriteBuffer();
-		static bool WaitForAvailability(const std::string& name, uint32_t timeoutMs, uint32_t pollPeriodMs = 10);
+		static bool WaitForAvailability(const std::string& baseName, uint32_t timeoutMs, bool noSuffix = false, uint32_t pollPeriodMs = 5);
+		static bool WaitForVacancy(const std::string& baseName, uint32_t timeoutMs, bool noSuffix = false, uint32_t pollPeriodMs = 5);
 		uint32_t GetId() const;
 		std::string GetName() const;
 		static std::string GetSecurityString(SecurityMode mode);

IntelPresentMon/Core/source/infra/LogSetup.cpp

@@ -236,7 +236,7 @@ namespace p2c
 			try {
 				const auto fullPipeName = R"(\\.\pipe\)" + pipePrefix;
 				// wait maximum 1.5sec for pipe to be created
-				if (!pipe::DuplexPipe::WaitForAvailability(fullPipeName, 1500)) {
+				if (!pipe::DuplexPipe::WaitForAvailability(fullPipeName, 1500, true)) {
 					pmlog_warn(std::format("Failed to connect to logging source server {} after waiting 1.5s", pipePrefix));
 					return;
 				}

IntelPresentMon/Core/source/kernel/InjectorComplex.cpp

@@ -146,7 +146,7 @@ namespace p2c::kern
 				try {
 					int pid = std::stoi(line);
 					const auto pipeName = inj::act::MakePipeName(pid);
-					::pmon::util::pipe::DuplexPipe::WaitForAvailability(pipeName + "-in", 2'000, 250);
+					::pmon::util::pipe::DuplexPipe::WaitForAvailability(pipeName, 2'000, false, 250);
 					{
 						std::lock_guard lk{ actionClientMutex_ };
 						injectionPointClient_.emplace(pipeName);

IntelPresentMon/PresentMonAPI2/PresentMonAPI.cpp

@@ -194,7 +194,12 @@ PRESENTMON_API2_EXPORT PM_STATUS pmGetIntrospectionRoot(PM_SESSION_HANDLE handle
 			return PM_STATUS_BAD_ARGUMENT;
 		}
 		const auto pIntro = LookupMiddleware_(handle).GetIntrospectionData();
-		AddHandleMapping_(handle, pIntro);
+		// we don't need the middleware to free introspection data
+		// detaching like this (eliding handle mapping) will allow introspection data
+		// to not obstruct cleanup of middleware
+		// if the lifecycle of marshalled introspection data changes this might need to
+		// change as well
+		// AddHandleMapping_(handle, pIntro);
 		*ppInterface = pIntro;
 		return PM_STATUS_SUCCESS;
 	}
@@ -212,9 +217,11 @@ PRESENTMON_API2_EXPORT PM_STATUS pmFreeIntrospectionRoot(const PM_INTROSPECTION_
 			// freeing nullptr is a no-op
 			return PM_STATUS_SUCCESS;
 		}
-		auto& mid = LookupMiddleware_(pInterface);
-		RemoveHandleMapping_(pInterface);
-		mid.FreeIntrospectionData(pInterface);
+		// see note in pmGetIntrospectionRoot above
+		// RemoveHandleMapping_(pInterface);
+		// if we free directly here instead of using the middleware method
+		// we can support freeing even after middleware has been destroyed
+		free(const_cast<PM_INTROSPECTION_ROOT*>(pInterface));
 		return PM_STATUS_SUCCESS;
 	}
 	catch (...) {