RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 20:07:36 +00:00
Code Issues Activity Actions

LibCore: Merge the CSyscallUtils namespace into Core

Browse source
This commit is contained in:
Andreas Kling 2020-02-06 15:04:57 +01:00
parent d17e23bd27
commit 258d798b34
4 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Libraries/LibCore/EventLoop.cpp
View file

@ -382,7 +382,7 @@ void EventLoop::wait_for_event(WaitMode mode)
should_wait_forever = false; should_wait_forever = false;
} }
int marked_fd_count = CSyscallUtils::safe_syscall(select, max_fd + 1, &rfds, &wfds, nullptr, should_wait_forever ? nullptr : &timeout); int marked_fd_count = Core::safe_syscall(select, max_fd + 1, &rfds, &wfds, nullptr, should_wait_forever ? nullptr : &timeout);
if (FD_ISSET(s_wake_pipe_fds[0], &rfds)) { if (FD_ISSET(s_wake_pipe_fds[0], &rfds)) {
char buffer[32]; char buffer[32];
auto nread = read(s_wake_pipe_fds[0], buffer, sizeof(buffer)); auto nread = read(s_wake_pipe_fds[0], buffer, sizeof(buffer));

2
Libraries/LibCore/IODevice.cpp
View file

@ -110,7 +110,7 @@ bool IODevice::can_read_from_fd() const
struct timeval timeout { struct timeval timeout {
0, 0 0, 0
}; };
int rc = CSyscallUtils::safe_syscall(select, m_fd + 1, &rfds, nullptr, nullptr, &timeout); int rc = Core::safe_syscall(select, m_fd + 1, &rfds, nullptr, nullptr, &timeout);
if (rc < 0) { if (rc < 0) {
// NOTE: We don't set m_error here. // NOTE: We don't set m_error here.
perror("IODevice::can_read: select"); perror("IODevice::can_read: select");

4
Libraries/LibCore/SyscallUtils.h
View file

@ -32,7 +32,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <unistd.h> #include <unistd.h>
namespace CSyscallUtils { namespace Core {
template<typename Syscall, class... Args> template<typename Syscall, class... Args>
inline int safe_syscall(Syscall syscall, Args&&... args) inline int safe_syscall(Syscall syscall, Args&&... args)
@ -41,7 +41,7 @@ inline int safe_syscall(Syscall syscall, Args&&... args)
int sysret = syscall(forward<Args>(args)...); int sysret = syscall(forward<Args>(args)...);
if (sysret == -1) { if (sysret == -1) {
int saved_errno = errno; int saved_errno = errno;
dbg() << "CSafeSyscall: " << sysret << " (" << saved_errno << ": " << strerror(saved_errno) << ")"; dbg() << "Core::safe_syscall: " << sysret << " (" << saved_errno << ": " << strerror(saved_errno) << ")";
if (errno == EINTR) if (errno == EINTR)
continue; continue;
ASSERT_NOT_REACHED(); ASSERT_NOT_REACHED();

2
Libraries/LibIPC/ServerConnection.h
View file

@ -100,7 +100,7 @@ public:
fd_set rfds; fd_set rfds;
FD_ZERO(&rfds); FD_ZERO(&rfds);
FD_SET(m_connection->fd(), &rfds); FD_SET(m_connection->fd(), &rfds);
int rc = CSyscallUtils::safe_syscall(select, m_connection->fd() + 1, &rfds, nullptr, nullptr, nullptr); int rc = Core::safe_syscall(select, m_connection->fd() + 1, &rfds, nullptr, nullptr, nullptr);
if (rc < 0) { if (rc < 0) {
perror("select"); perror("select");
} }