event/SocketMonitor: add "noexcept"
This commit is contained in:
@@ -142,7 +142,7 @@ private:
|
|||||||
void Disconnect();
|
void Disconnect();
|
||||||
|
|
||||||
/* virtual methods from SocketMonitor */
|
/* virtual methods from SocketMonitor */
|
||||||
bool OnSocketReady(unsigned flags) override;
|
bool OnSocketReady(unsigned flags) noexcept override;
|
||||||
|
|
||||||
/* virtual methods from IdleMonitor */
|
/* virtual methods from IdleMonitor */
|
||||||
void OnIdle() override;
|
void OnIdle() override;
|
||||||
@@ -459,7 +459,7 @@ ProxyDatabase::Disconnect()
|
|||||||
}
|
}
|
||||||
|
|
||||||
bool
|
bool
|
||||||
ProxyDatabase::OnSocketReady(gcc_unused unsigned flags)
|
ProxyDatabase::OnSocketReady(gcc_unused unsigned flags) noexcept
|
||||||
{
|
{
|
||||||
assert(connection != nullptr);
|
assert(connection != nullptr);
|
||||||
|
|
||||||
|
@@ -32,7 +32,7 @@
|
|||||||
#include <limits.h>
|
#include <limits.h>
|
||||||
|
|
||||||
bool
|
bool
|
||||||
InotifySource::OnSocketReady(gcc_unused unsigned flags)
|
InotifySource::OnSocketReady(gcc_unused unsigned flags) noexcept
|
||||||
{
|
{
|
||||||
uint8_t buffer[4096];
|
uint8_t buffer[4096];
|
||||||
static_assert(sizeof(buffer) >= sizeof(struct inotify_event) + NAME_MAX + 1,
|
static_assert(sizeof(buffer) >= sizeof(struct inotify_event) + NAME_MAX + 1,
|
||||||
|
@@ -66,7 +66,7 @@ public:
|
|||||||
void Remove(unsigned wd);
|
void Remove(unsigned wd);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
virtual bool OnSocketReady(unsigned flags) override;
|
bool OnSocketReady(unsigned flags) noexcept override;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
@@ -99,7 +99,7 @@ BufferedSocket::ResumeInput()
|
|||||||
}
|
}
|
||||||
|
|
||||||
bool
|
bool
|
||||||
BufferedSocket::OnSocketReady(unsigned flags)
|
BufferedSocket::OnSocketReady(unsigned flags) noexcept
|
||||||
{
|
{
|
||||||
assert(IsDefined());
|
assert(IsDefined());
|
||||||
|
|
||||||
|
@@ -113,7 +113,8 @@ protected:
|
|||||||
virtual void OnSocketError(std::exception_ptr ep) = 0;
|
virtual void OnSocketError(std::exception_ptr ep) = 0;
|
||||||
virtual void OnSocketClosed() = 0;
|
virtual void OnSocketClosed() = 0;
|
||||||
|
|
||||||
virtual bool OnSocketReady(unsigned flags) override;
|
/* virtual methods from class SocketMonitor */
|
||||||
|
bool OnSocketReady(unsigned flags) noexcept override;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
@@ -93,7 +93,7 @@ FullyBufferedSocket::Write(const void *data, size_t length)
|
|||||||
}
|
}
|
||||||
|
|
||||||
bool
|
bool
|
||||||
FullyBufferedSocket::OnSocketReady(unsigned flags)
|
FullyBufferedSocket::OnSocketReady(unsigned flags) noexcept
|
||||||
{
|
{
|
||||||
if (flags & WRITE) {
|
if (flags & WRITE) {
|
||||||
assert(!output.empty());
|
assert(!output.empty());
|
||||||
|
@@ -61,7 +61,9 @@ protected:
|
|||||||
*/
|
*/
|
||||||
bool Write(const void *data, size_t length);
|
bool Write(const void *data, size_t length);
|
||||||
|
|
||||||
virtual bool OnSocketReady(unsigned flags) override;
|
/* virtual methods from class SocketMonitor */
|
||||||
|
bool OnSocketReady(unsigned flags) noexcept override;
|
||||||
|
|
||||||
virtual void OnIdle() override;
|
virtual void OnIdle() override;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@@ -256,7 +256,7 @@ EventLoop::HandleDeferred()
|
|||||||
}
|
}
|
||||||
|
|
||||||
bool
|
bool
|
||||||
EventLoop::OnSocketReady(gcc_unused unsigned flags)
|
EventLoop::OnSocketReady(gcc_unused unsigned flags) noexcept
|
||||||
{
|
{
|
||||||
assert(IsInside());
|
assert(IsInside());
|
||||||
|
|
||||||
|
@@ -188,7 +188,7 @@ private:
|
|||||||
*/
|
*/
|
||||||
void HandleDeferred();
|
void HandleDeferred();
|
||||||
|
|
||||||
virtual bool OnSocketReady(unsigned flags) override;
|
bool OnSocketReady(unsigned flags) noexcept override;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
|
||||||
|
@@ -80,7 +80,7 @@ class MultiSocketMonitor : IdleMonitor
|
|||||||
}
|
}
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
virtual bool OnSocketReady(unsigned flags) override {
|
bool OnSocketReady(unsigned flags) noexcept override {
|
||||||
revents = flags;
|
revents = flags;
|
||||||
multi.SetReady();
|
multi.SetReady();
|
||||||
return true;
|
return true;
|
||||||
|
@@ -115,7 +115,7 @@ public:
|
|||||||
void Accept() noexcept;
|
void Accept() noexcept;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
virtual bool OnSocketReady(unsigned flags) override;
|
bool OnSocketReady(unsigned flags) noexcept override;
|
||||||
};
|
};
|
||||||
|
|
||||||
static constexpr Domain server_socket_domain("server_socket");
|
static constexpr Domain server_socket_domain("server_socket");
|
||||||
@@ -169,7 +169,7 @@ OneServerSocket::Accept() noexcept
|
|||||||
}
|
}
|
||||||
|
|
||||||
bool
|
bool
|
||||||
OneServerSocket::OnSocketReady(gcc_unused unsigned flags)
|
OneServerSocket::OnSocketReady(gcc_unused unsigned flags) noexcept
|
||||||
{
|
{
|
||||||
Accept();
|
Accept();
|
||||||
return true;
|
return true;
|
||||||
|
@@ -81,7 +81,7 @@ public:
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
private:
|
private:
|
||||||
virtual bool OnSocketReady(unsigned flags) override;
|
bool OnSocketReady(unsigned flags) noexcept override;
|
||||||
};
|
};
|
||||||
|
|
||||||
/* this should be enough - is it? */
|
/* this should be enough - is it? */
|
||||||
@@ -197,7 +197,7 @@ SignalMonitorRegister(int signo, SignalHandler handler)
|
|||||||
}
|
}
|
||||||
|
|
||||||
bool
|
bool
|
||||||
SignalMonitor::OnSocketReady(unsigned)
|
SignalMonitor::OnSocketReady(unsigned) noexcept
|
||||||
{
|
{
|
||||||
#ifdef USE_SIGNALFD
|
#ifdef USE_SIGNALFD
|
||||||
int signo;
|
int signo;
|
||||||
|
@@ -30,7 +30,7 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
void
|
void
|
||||||
SocketMonitor::Dispatch(unsigned flags)
|
SocketMonitor::Dispatch(unsigned flags) noexcept
|
||||||
{
|
{
|
||||||
flags &= GetScheduledFlags();
|
flags &= GetScheduledFlags();
|
||||||
|
|
||||||
@@ -38,14 +38,14 @@ SocketMonitor::Dispatch(unsigned flags)
|
|||||||
Cancel();
|
Cancel();
|
||||||
}
|
}
|
||||||
|
|
||||||
SocketMonitor::~SocketMonitor()
|
SocketMonitor::~SocketMonitor() noexcept
|
||||||
{
|
{
|
||||||
if (IsDefined())
|
if (IsDefined())
|
||||||
Cancel();
|
Cancel();
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
SocketMonitor::Open(SocketDescriptor _fd)
|
SocketMonitor::Open(SocketDescriptor _fd) noexcept
|
||||||
{
|
{
|
||||||
assert(!fd.IsDefined());
|
assert(!fd.IsDefined());
|
||||||
assert(_fd.IsDefined());
|
assert(_fd.IsDefined());
|
||||||
@@ -54,7 +54,7 @@ SocketMonitor::Open(SocketDescriptor _fd)
|
|||||||
}
|
}
|
||||||
|
|
||||||
SocketDescriptor
|
SocketDescriptor
|
||||||
SocketMonitor::Steal()
|
SocketMonitor::Steal() noexcept
|
||||||
{
|
{
|
||||||
assert(IsDefined());
|
assert(IsDefined());
|
||||||
|
|
||||||
@@ -64,7 +64,7 @@ SocketMonitor::Steal()
|
|||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
SocketMonitor::Abandon()
|
SocketMonitor::Abandon() noexcept
|
||||||
{
|
{
|
||||||
assert(IsDefined());
|
assert(IsDefined());
|
||||||
|
|
||||||
@@ -73,13 +73,13 @@ SocketMonitor::Abandon()
|
|||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
SocketMonitor::Close()
|
SocketMonitor::Close() noexcept
|
||||||
{
|
{
|
||||||
Steal().Close();
|
Steal().Close();
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
SocketMonitor::Schedule(unsigned flags)
|
SocketMonitor::Schedule(unsigned flags) noexcept
|
||||||
{
|
{
|
||||||
assert(IsDefined());
|
assert(IsDefined());
|
||||||
|
|
||||||
@@ -97,7 +97,7 @@ SocketMonitor::Schedule(unsigned flags)
|
|||||||
}
|
}
|
||||||
|
|
||||||
SocketMonitor::ssize_t
|
SocketMonitor::ssize_t
|
||||||
SocketMonitor::Read(void *data, size_t length)
|
SocketMonitor::Read(void *data, size_t length) noexcept
|
||||||
{
|
{
|
||||||
assert(IsDefined());
|
assert(IsDefined());
|
||||||
|
|
||||||
@@ -110,7 +110,7 @@ SocketMonitor::Read(void *data, size_t length)
|
|||||||
}
|
}
|
||||||
|
|
||||||
SocketMonitor::ssize_t
|
SocketMonitor::ssize_t
|
||||||
SocketMonitor::Write(const void *data, size_t length)
|
SocketMonitor::Write(const void *data, size_t length) noexcept
|
||||||
{
|
{
|
||||||
assert(IsDefined());
|
assert(IsDefined());
|
||||||
|
|
||||||
|
@@ -61,82 +61,82 @@ public:
|
|||||||
|
|
||||||
typedef std::make_signed<size_t>::type ssize_t;
|
typedef std::make_signed<size_t>::type ssize_t;
|
||||||
|
|
||||||
explicit SocketMonitor(EventLoop &_loop)
|
explicit SocketMonitor(EventLoop &_loop) noexcept
|
||||||
:loop(_loop) {}
|
:loop(_loop) {}
|
||||||
|
|
||||||
SocketMonitor(SocketDescriptor _fd, EventLoop &_loop)
|
SocketMonitor(SocketDescriptor _fd, EventLoop &_loop) noexcept
|
||||||
:fd(_fd), loop(_loop) {}
|
:fd(_fd), loop(_loop) {}
|
||||||
|
|
||||||
~SocketMonitor();
|
~SocketMonitor() noexcept;
|
||||||
|
|
||||||
EventLoop &GetEventLoop() {
|
EventLoop &GetEventLoop() noexcept {
|
||||||
return loop;
|
return loop;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool IsDefined() const {
|
bool IsDefined() const noexcept {
|
||||||
return fd.IsDefined();
|
return fd.IsDefined();
|
||||||
}
|
}
|
||||||
|
|
||||||
SocketDescriptor Get() const {
|
SocketDescriptor Get() const noexcept {
|
||||||
assert(IsDefined());
|
assert(IsDefined());
|
||||||
|
|
||||||
return fd;
|
return fd;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Open(SocketDescriptor _fd);
|
void Open(SocketDescriptor _fd) noexcept;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* "Steal" the socket descriptor. This abandons the socket
|
* "Steal" the socket descriptor. This abandons the socket
|
||||||
* and returns it.
|
* and returns it.
|
||||||
*/
|
*/
|
||||||
SocketDescriptor Steal();
|
SocketDescriptor Steal() noexcept;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Somebody has closed the socket. Unregister this object.
|
* Somebody has closed the socket. Unregister this object.
|
||||||
*/
|
*/
|
||||||
void Abandon();
|
void Abandon() noexcept;
|
||||||
|
|
||||||
void Close();
|
void Close() noexcept;
|
||||||
|
|
||||||
unsigned GetScheduledFlags() const {
|
unsigned GetScheduledFlags() const noexcept {
|
||||||
assert(IsDefined());
|
assert(IsDefined());
|
||||||
|
|
||||||
return scheduled_flags;
|
return scheduled_flags;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Schedule(unsigned flags);
|
void Schedule(unsigned flags) noexcept;
|
||||||
|
|
||||||
void Cancel() {
|
void Cancel() noexcept {
|
||||||
Schedule(0);
|
Schedule(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
void ScheduleRead() {
|
void ScheduleRead() noexcept {
|
||||||
Schedule(GetScheduledFlags() | READ | HANGUP | ERROR);
|
Schedule(GetScheduledFlags() | READ | HANGUP | ERROR);
|
||||||
}
|
}
|
||||||
|
|
||||||
void ScheduleWrite() {
|
void ScheduleWrite() noexcept {
|
||||||
Schedule(GetScheduledFlags() | WRITE);
|
Schedule(GetScheduledFlags() | WRITE);
|
||||||
}
|
}
|
||||||
|
|
||||||
void CancelRead() {
|
void CancelRead() noexcept {
|
||||||
Schedule(GetScheduledFlags() & ~(READ|HANGUP|ERROR));
|
Schedule(GetScheduledFlags() & ~(READ|HANGUP|ERROR));
|
||||||
}
|
}
|
||||||
|
|
||||||
void CancelWrite() {
|
void CancelWrite() noexcept {
|
||||||
Schedule(GetScheduledFlags() & ~WRITE);
|
Schedule(GetScheduledFlags() & ~WRITE);
|
||||||
}
|
}
|
||||||
|
|
||||||
ssize_t Read(void *data, size_t length);
|
ssize_t Read(void *data, size_t length) noexcept;
|
||||||
ssize_t Write(const void *data, size_t length);
|
ssize_t Write(const void *data, size_t length) noexcept;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
/**
|
/**
|
||||||
* @return false if the socket has been closed
|
* @return false if the socket has been closed
|
||||||
*/
|
*/
|
||||||
virtual bool OnSocketReady(unsigned flags) = 0;
|
virtual bool OnSocketReady(unsigned flags) noexcept = 0;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
void Dispatch(unsigned flags);
|
void Dispatch(unsigned flags) noexcept;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
@@ -65,7 +65,7 @@ public:
|
|||||||
curl_socket_t s, int action,
|
curl_socket_t s, int action,
|
||||||
void *userp, void *socketp) noexcept;
|
void *userp, void *socketp) noexcept;
|
||||||
|
|
||||||
virtual bool OnSocketReady(unsigned flags) override;
|
bool OnSocketReady(unsigned flags) noexcept override;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
static constexpr int FlagsToCurlCSelect(unsigned flags) {
|
static constexpr int FlagsToCurlCSelect(unsigned flags) {
|
||||||
@@ -145,7 +145,7 @@ CurlSocket::SocketFunction(gcc_unused CURL *easy,
|
|||||||
}
|
}
|
||||||
|
|
||||||
bool
|
bool
|
||||||
CurlSocket::OnSocketReady(unsigned flags)
|
CurlSocket::OnSocketReady(unsigned flags) noexcept
|
||||||
{
|
{
|
||||||
assert(GetEventLoop().IsInside());
|
assert(GetEventLoop().IsInside());
|
||||||
|
|
||||||
|
@@ -446,7 +446,7 @@ NfsConnection::Service(unsigned flags)
|
|||||||
}
|
}
|
||||||
|
|
||||||
bool
|
bool
|
||||||
NfsConnection::OnSocketReady(unsigned flags)
|
NfsConnection::OnSocketReady(unsigned flags) noexcept
|
||||||
{
|
{
|
||||||
assert(GetEventLoop().IsInside());
|
assert(GetEventLoop().IsInside());
|
||||||
assert(deferred_close.empty());
|
assert(deferred_close.empty());
|
||||||
|
@@ -230,7 +230,7 @@ private:
|
|||||||
int Service(unsigned flags);
|
int Service(unsigned flags);
|
||||||
|
|
||||||
/* virtual methods from SocketMonitor */
|
/* virtual methods from SocketMonitor */
|
||||||
virtual bool OnSocketReady(unsigned flags) override;
|
bool OnSocketReady(unsigned flags) noexcept override;
|
||||||
|
|
||||||
/* callback for #mount_timeout_event */
|
/* callback for #mount_timeout_event */
|
||||||
void OnMountTimeout();
|
void OnMountTimeout();
|
||||||
|
@@ -403,7 +403,7 @@ HttpdClient::PushMetaData(PagePtr page)
|
|||||||
}
|
}
|
||||||
|
|
||||||
bool
|
bool
|
||||||
HttpdClient::OnSocketReady(unsigned flags)
|
HttpdClient::OnSocketReady(unsigned flags) noexcept
|
||||||
{
|
{
|
||||||
if (!BufferedSocket::OnSocketReady(flags))
|
if (!BufferedSocket::OnSocketReady(flags))
|
||||||
return false;
|
return false;
|
||||||
|
@@ -191,7 +191,9 @@ private:
|
|||||||
void ClearQueue();
|
void ClearQueue();
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
virtual bool OnSocketReady(unsigned flags) override;
|
/* virtual methods from class SocketMonitor */
|
||||||
|
bool OnSocketReady(unsigned flags) noexcept override;
|
||||||
|
|
||||||
virtual InputResult OnSocketInput(void *data, size_t length) override;
|
virtual InputResult OnSocketInput(void *data, size_t length) override;
|
||||||
void OnSocketError(std::exception_ptr ep) override;
|
void OnSocketError(std::exception_ptr ep) override;
|
||||||
virtual void OnSocketClosed() override;
|
virtual void OnSocketClosed() override;
|
||||||
|
@@ -69,8 +69,9 @@ public:
|
|||||||
delete w;
|
delete w;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected:
|
private:
|
||||||
virtual bool OnSocketReady(unsigned flags) {
|
/* virtual methods from class SocketMonitor */
|
||||||
|
bool OnSocketReady(unsigned flags) noexcept {
|
||||||
received = ToAvahiWatchEvent(flags);
|
received = ToAvahiWatchEvent(flags);
|
||||||
callback(this, Get().Get(), received, userdata);
|
callback(this, Get().Get(), received, userdata);
|
||||||
received = AvahiWatchEvent(0);
|
received = AvahiWatchEvent(0);
|
||||||
|
@@ -48,7 +48,8 @@ public:
|
|||||||
}
|
}
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
virtual bool OnSocketReady(gcc_unused unsigned flags) override {
|
/* virtual methods from class SocketMonitor */
|
||||||
|
bool OnSocketReady(gcc_unused unsigned flags) noexcept override {
|
||||||
DNSServiceProcessResult(service_ref);
|
DNSServiceProcessResult(service_ref);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user