Merged main into linux-mac

1 files changed, 93 insertions, 19 deletions

diff --git a/zencore/thread.cpp b/zencore/thread.cpp
index 620ea3bff..ded180337 100644
--- a/zencore/thread.cpp
+++ b/zencore/thread.cpp
@@ -17,41 +17,25 @@ namespace zen {
 void
 RwLock::AcquireShared()
 {
-#if ZEN_PLATFORM_WINDOWS
-	AcquireSRWLockShared((PSRWLOCK)&m_Srw);
-#else
 	m_Mutex.lock_shared();
-#endif
 }
 
 void
 RwLock::ReleaseShared()
 {
-#if ZEN_PLATFORM_WINDOWS
-	ReleaseSRWLockShared((PSRWLOCK)&m_Srw);
-#else
 	m_Mutex.unlock_shared();
-#endif
 }
 
 void
 RwLock::AcquireExclusive()
 {
-#if ZEN_PLATFORM_WINDOWS
-	AcquireSRWLockExclusive((PSRWLOCK)&m_Srw);
-#else
 	m_Mutex.lock();
-#endif
 }
 
 void
 RwLock::ReleaseExclusive()
 {
-#if ZEN_PLATFORM_WINDOWS
-	ReleaseSRWLockExclusive((PSRWLOCK)&m_Srw);
-#else
 	m_Mutex.unlock();
-#endif
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -78,6 +62,13 @@ Event::Reset()
 	ResetEvent(m_EventHandle);
 }
 
+void
+Event::Close()
+{
+	CloseHandle(m_EventHandle);
+	m_EventHandle = nullptr;
+}
+
 bool
 Event::Wait(int TimeoutMs)
 {
@@ -174,6 +165,7 @@ ProcessHandle::Initialize(void* ProcessHandle)
 	ZEN_ASSERT(m_ProcessHandle == nullptr);
 	// TODO: perform some debug verification here to verify it's a valid handle?
 	m_ProcessHandle = ProcessHandle;
+	m_Pid			= GetProcessId(m_ProcessHandle);
 }
 
 ProcessHandle::~ProcessHandle()
@@ -255,7 +247,8 @@ ProcessHandle::Wait(int TimeoutMs)
 
 		case WAIT_FAILED:
 			// What might go wrong here, and what is meaningful to act on?
-			throw WindowsException("Process::Wait failed");
+			using namespace std::literals;
+			ThrowLastError("Process::Wait failed"sv);
 	}
 
 	return false;
@@ -263,19 +256,100 @@ ProcessHandle::Wait(int TimeoutMs)
 
 //////////////////////////////////////////////////////////////////////////
 
+ProcessMonitor::ProcessMonitor()
+{
+}
+
+ProcessMonitor::~ProcessMonitor()
+{
+	RwLock::ExclusiveLockScope _(m_Lock);
+
+	for (HANDLE& Proc : m_ProcessHandles)
+	{
+		CloseHandle(Proc);
+		Proc = 0;
+	}
+}
+
+bool
+ProcessMonitor::IsRunning()
+{
+	RwLock::ExclusiveLockScope _(m_Lock);
+
+	bool FoundOne = false;
+
+	for (HANDLE& Proc : m_ProcessHandles)
+	{
+		DWORD ExitCode = 0;
+		GetExitCodeProcess(Proc, &ExitCode);
+
+		if (ExitCode != STILL_ACTIVE)
+		{
+			CloseHandle(Proc);
+			Proc = 0;
+		}
+		else
+		{
+			// Still alive
+			FoundOne = true;
+		}
+	}
+
+	std::erase_if(m_ProcessHandles, [](HANDLE Handle) { return Handle == 0; });
+
+	return FoundOne;
+}
+
+void
+ProcessMonitor::AddPid(int Pid)
+{
+	HANDLE ProcessHandle = OpenProcess(PROCESS_QUERY_INFORMATION | SYNCHRONIZE, FALSE, Pid);
+
+	if (ProcessHandle)
+	{
+		RwLock::ExclusiveLockScope _(m_Lock);
+		m_ProcessHandles.push_back(ProcessHandle);
+	}
+}
+
+bool
+ProcessMonitor::IsActive() const
+{
+	RwLock::SharedLockScope _(m_Lock);
+	return m_ProcessHandles.empty() == false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+
 bool
 IsProcessRunning(int pid)
 {
+	// This function is arguably not super useful, a pid can be re-used
+	// by the OS so holding on to a pid and polling it over some time
+	// period will not necessarily tell you what you probably want to know.
+
+#if ZEN_PLATFORM_WINDOWS
 	HANDLE hProc = OpenProcess(PROCESS_QUERY_LIMITED_INFORMATION, FALSE, pid);
 
-	if (hProc == NULL)
+	if (!hProc)
 	{
-		return false;
+		DWORD Error = zen::GetLastError();
+
+		if (Error == ERROR_INVALID_PARAMETER)
+		{
+			return false;
+		}
+
+		using namespace fmt::literals;
+		ThrowSystemError(Error, "failed to open process with pid {}"_format(pid));
 	}
 
 	CloseHandle(hProc);
 
 	return true;
+#else
+	ZEN_NOT_IMPLEMENTED();
+#endif
 }
 
 int