Revert "Revert "CStdEvent: Change GetFDs() to GetFD() since the write…

… side of the pipe is an implementation detail"" This reverts commit 06baf6b.
legacyclonk · Sep 30, 2023 · 68b67e4 · 68b67e4
1 parent 6c28aaa
commit 68b67e4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/C4Awaiter.h b/src/C4Awaiter.h
@@ -125,7 +125,7 @@ namespace C4Awaiter
 			void SetupCancellation(C4Task::CancellablePromise *const promise)
 			{
 				cancellationEvent.emplace();
-				fds[1].fd = cancellationEvent->GetFDs()[0];
+				fds[1].fd = cancellationEvent->GetFD();
 
 				promise->SetCancellationCallback([](void *const argument)
 				{
@@ -217,7 +217,7 @@ namespace C4Awaiter
 			void SetupCancellation(C4Task::CancellablePromise *const promise)
 			{
 				cancellationEvent.emplace();
-				fds.push_back({.fd = cancellationEvent->GetFDs()[0], .events = POLLIN});
+				fds.push_back({.fd = cancellationEvent->GetFD(), .events = POLLIN});
 
 				promise->SetCancellationCallback([](void *const argument)
 				{

diff --git a/src/StdScheduler.h b/src/StdScheduler.h
@@ -79,7 +79,7 @@ class StdScheduler
 	std::vector<StdSchedulerProc *> eventProcs;
 #else
 	CStdEvent unblocker;
-	std::vector<pollfd> fds{{.fd = unblocker.GetFDs()[0], .events = POLLIN}};
+	std::vector<pollfd> fds{{.fd = unblocker.GetFD(), .events = POLLIN}};
 #endif
 
 public:

diff --git a/src/StdSync.h b/src/StdSync.h
@@ -94,7 +94,7 @@ class CStdEvent
 public:
 	static CStdEvent AutoReset(bool initialState = false);
 #else
-	std::array<int, 2> GetFDs() const { return {fd[0].load(std::memory_order_acquire), fd[1].load(std::memory_order_acquire)}; }
+	int GetFD() const noexcept { return fd[0].load(std::memory_order_acquire); }
 #endif
 
 private: