Merge branch 'main' of https://github.com/EpicGames/zen

1 files changed, 20 insertions, 19 deletions

diff --git a/zencore/thread.cpp b/zencore/thread.cpp
index 1c7e4b3ab..d4f101454 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
 }
 
 Event::Event()
@@ -257,7 +241,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;
@@ -333,16 +318,32 @@ ProcessMonitor::IsActive() const
 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