diff --git a/Source/Common/Async.h b/Source/Common/Async.h index 7035113ec..88edc84cd 100644 --- a/Source/Common/Async.h +++ b/Source/Common/Async.h @@ -64,7 +64,7 @@ public: } // Maps FD to callback - fextl::map> read_callbacks; + fextl::map> callbacks; struct Event { pollfd FD; @@ -78,7 +78,7 @@ public: void enable_async_stop() { ::pipe(AsyncStopRequest); PollFDs.push_back(pollfd {.fd = AsyncStopRequest[0], .events = POLLHUP, .revents = 0}); - read_callbacks[AsyncStopRequest[0]] = [](error) { + callbacks[AsyncStopRequest[0]] = [](error) { return post_callback::stop_reactor; }; } @@ -114,19 +114,19 @@ public: } if (ActiveFD.revents & POLLIN) { // NOTE: For sockets, this is triggered on close, too. Pipes only report POLLHUP, however. - auto Callback = std::move(read_callbacks[ActiveFD.fd]); + auto Callback = std::move(callbacks[ActiveFD.fd]); if (!Callback) { ERROR_AND_DIE_FMT("Data available for reading on FD {} but no read callback registered", ActiveFD.fd); } auto Ret = Callback(error::success); if (Ret == post_callback::repeat) { - read_callbacks[ActiveFD.fd] = std::move(Callback); + callbacks[ActiveFD.fd] = std::move(Callback); } else if (Ret == post_callback::stop_reactor) { exit_requested = true; } } if (ActiveFD.revents & (POLLHUP | POLLERR | POLLNVAL | POLLRDHUP)) { - auto Callback = std::move(read_callbacks[ActiveFD.fd]); + auto Callback = std::move(callbacks[ActiveFD.fd]); if (Callback) { exit_requested |= (Callback(error::eof) == post_callback::stop_reactor); } @@ -167,7 +167,7 @@ private: } close(Event.FD.fd); PollFDs.erase(PollFDs.begin() + Index); - read_callbacks.erase(Event.FD.fd); + callbacks.erase(Event.FD.fd); } if (Event.Insert) { @@ -366,7 +366,7 @@ struct posix_descriptor { template requires std::is_invocable_r_v void async_wait(Fn Callback) { - [[maybe_unused]] auto Previous = std::exchange(Reactor->read_callbacks[FD], std::move(Callback)); + [[maybe_unused]] auto Previous = std::exchange(Reactor->callbacks[FD], std::move(Callback)); assert(!Previous && "May not queue multiple async operations"); } }; diff --git a/Source/Common/AsyncNet.h b/Source/Common/AsyncNet.h index a5098c774..cda88fda0 100644 --- a/Source/Common/AsyncNet.h +++ b/Source/Common/AsyncNet.h @@ -56,7 +56,7 @@ struct tcp_socket { return post_callback::drop; }; - [[maybe_unused]] auto Previous = std::exchange(Reactor.read_callbacks[FD], std::move(Callback)); + [[maybe_unused]] auto Previous = std::exchange(Reactor.callbacks[FD], std::move(Callback)); assert(!Previous && "May not queue multiple async operations"); } @@ -249,7 +249,7 @@ struct tcp_acceptor { } void async_accept(fextl::move_only_function)> OnAccept) { - Reactor.read_callbacks[FD] = [ServerFD = FD, &Reactor = Reactor, OnAccept = std::move(OnAccept)](error ec) mutable { + Reactor.callbacks[FD] = [ServerFD = FD, &Reactor = Reactor, OnAccept = std::move(OnAccept)](error ec) mutable { if (ec != error::success) { return post_callback::drop; } diff --git a/Source/Tools/FEXServer/ProcessPipe.cpp b/Source/Tools/FEXServer/ProcessPipe.cpp index ba7ee052c..2582590e1 100644 --- a/Source/Tools/FEXServer/ProcessPipe.cpp +++ b/Source/Tools/FEXServer/ProcessPipe.cpp @@ -196,7 +196,7 @@ bool InitializeServerSocket(bool abstract) { } auto Acceptor = fasio::tcp_acceptor::create(Reactor, abstract, ServerSocketName); if (!Acceptor) { - LogMan::Msg::EFmt("Failed to create FEXServer socket: error {} (){})", errno, strerror(errno)); + LogMan::Msg::EFmt("Failed to create FEXServer socket: error {} ({})", errno, strerror(errno)); return false; } @@ -210,7 +210,7 @@ bool InitializeServerSocket(bool abstract) { } int FD = Socket->FD; - Reactor.read_callbacks[FD] = [Socket = std::move(Socket).value()](fasio::error ec) mutable { + Reactor.callbacks[FD] = [Socket = std::move(Socket).value()](fasio::error ec) mutable { if (ec != fasio::error::success) { return fasio::post_callback::drop; }