oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

event/SocketMonitor: use class SocketDescriptor

Browse Source
This commit is contained in:
Max Kellermann
2017-08-10 18:25:22 +02:00
parent fcfc8bacc0
commit 492b20a89d
21 changed files with 80 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/event/SocketMonitor.cxx
View File

@@ -46,25 +46,22 @@ SocketMonitor::~SocketMonitor()
}
void
SocketMonitor::Open(int _fd)
SocketMonitor::Open(SocketDescriptor _fd)
{
assert(fd < 0);
assert(_fd >= 0);
assert(!fd.IsDefined());
assert(_fd.IsDefined());
fd = _fd;
}
int
SocketDescriptor
SocketMonitor::Steal()
{
assert(IsDefined());
Cancel();
int result = fd;
fd = -1;
return result;
return std::exchange(fd, SocketDescriptor::Undefined());
}
void
@@ -72,15 +69,14 @@ SocketMonitor::Abandon()
{
assert(IsDefined());
int old_fd = fd;
fd = -1;
loop.Abandon(old_fd, *this);
loop.Abandon(std::exchange(fd, SocketDescriptor::Undefined()).Get(),
*this);
}
void
SocketMonitor::Close()
{
close_socket(Steal());
Steal().Close();
}
void
@@ -92,11 +88,11 @@ SocketMonitor::Schedule(unsigned flags)
return;
if (scheduled_flags == 0)
loop.AddFD(fd, flags, *this);
loop.AddFD(fd.Get(), flags, *this);
else if (flags == 0)
loop.RemoveFD(fd, *this);
loop.RemoveFD(fd.Get(), *this);
else
loop.ModifyFD(fd, flags, *this);
loop.ModifyFD(fd.Get(), flags, *this);
scheduled_flags = flags;
}
@@ -111,7 +107,7 @@ SocketMonitor::Read(void *data, size_t length)
flags |= MSG_DONTWAIT;
#endif
return recv(Get(), (char *)data, length, flags);
return recv(Get().Get(), (char *)data, length, flags);
}
SocketMonitor::ssize_t
@@ -127,5 +123,5 @@ SocketMonitor::Write(const void *data, size_t length)
flags |= MSG_DONTWAIT;
#endif
return send(Get(), (const char *)data, length, flags);
return send(Get().Get(), (const char *)data, length, flags);
}