Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mpd
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Иван Мажукин
mpd
Commits
59a88369
Commit
59a88369
authored
Nov 10, 2017
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
event/SocketMonitor: add "noexcept"
parent
9d402050
Hide whitespace changes
Inline
Side-by-side
Showing
21 changed files
with
61 additions
and
54 deletions
+61
-54
ProxyDatabasePlugin.cxx
src/db/plugins/ProxyDatabasePlugin.cxx
+2
-2
InotifySource.cxx
src/db/update/InotifySource.cxx
+1
-1
InotifySource.hxx
src/db/update/InotifySource.hxx
+1
-1
BufferedSocket.cxx
src/event/BufferedSocket.cxx
+1
-1
BufferedSocket.hxx
src/event/BufferedSocket.hxx
+2
-1
FullyBufferedSocket.cxx
src/event/FullyBufferedSocket.cxx
+1
-1
FullyBufferedSocket.hxx
src/event/FullyBufferedSocket.hxx
+3
-1
Loop.cxx
src/event/Loop.cxx
+1
-1
Loop.hxx
src/event/Loop.hxx
+1
-1
MultiSocketMonitor.hxx
src/event/MultiSocketMonitor.hxx
+1
-1
ServerSocket.cxx
src/event/ServerSocket.cxx
+2
-2
SignalMonitor.cxx
src/event/SignalMonitor.cxx
+2
-2
SocketMonitor.cxx
src/event/SocketMonitor.cxx
+9
-9
SocketMonitor.hxx
src/event/SocketMonitor.hxx
+21
-21
Global.cxx
src/lib/curl/Global.cxx
+2
-2
Connection.cxx
src/lib/nfs/Connection.cxx
+1
-1
Connection.hxx
src/lib/nfs/Connection.hxx
+1
-1
HttpdClient.cxx
src/output/plugins/httpd/HttpdClient.cxx
+1
-1
HttpdClient.hxx
src/output/plugins/httpd/HttpdClient.hxx
+3
-1
AvahiPoll.cxx
src/zeroconf/AvahiPoll.cxx
+3
-2
ZeroconfBonjour.cxx
src/zeroconf/ZeroconfBonjour.cxx
+2
-1
No files found.
src/db/plugins/ProxyDatabasePlugin.cxx
View file @
59a88369
...
...
@@ -142,7 +142,7 @@ private:
void
Disconnect
();
/* virtual methods from SocketMonitor */
bool
OnSocketReady
(
unsigned
flags
)
override
;
bool
OnSocketReady
(
unsigned
flags
)
noexcept
override
;
/* virtual methods from IdleMonitor */
void
OnIdle
()
override
;
...
...
@@ -459,7 +459,7 @@ ProxyDatabase::Disconnect()
}
bool
ProxyDatabase
::
OnSocketReady
(
gcc_unused
unsigned
flags
)
ProxyDatabase
::
OnSocketReady
(
gcc_unused
unsigned
flags
)
noexcept
{
assert
(
connection
!=
nullptr
);
...
...
src/db/update/InotifySource.cxx
View file @
59a88369
...
...
@@ -32,7 +32,7 @@
#include <limits.h>
bool
InotifySource
::
OnSocketReady
(
gcc_unused
unsigned
flags
)
InotifySource
::
OnSocketReady
(
gcc_unused
unsigned
flags
)
noexcept
{
uint8_t
buffer
[
4096
];
static_assert
(
sizeof
(
buffer
)
>=
sizeof
(
struct
inotify_event
)
+
NAME_MAX
+
1
,
...
...
src/db/update/InotifySource.hxx
View file @
59a88369
...
...
@@ -66,7 +66,7 @@ public:
void
Remove
(
unsigned
wd
);
private
:
virtual
bool
OnSocketReady
(
unsigned
flags
)
override
;
bool
OnSocketReady
(
unsigned
flags
)
noexcept
override
;
};
#endif
src/event/BufferedSocket.cxx
View file @
59a88369
...
...
@@ -99,7 +99,7 @@ BufferedSocket::ResumeInput()
}
bool
BufferedSocket
::
OnSocketReady
(
unsigned
flags
)
BufferedSocket
::
OnSocketReady
(
unsigned
flags
)
noexcept
{
assert
(
IsDefined
());
...
...
src/event/BufferedSocket.hxx
View file @
59a88369
...
...
@@ -113,7 +113,8 @@ protected:
virtual
void
OnSocketError
(
std
::
exception_ptr
ep
)
=
0
;
virtual
void
OnSocketClosed
()
=
0
;
virtual
bool
OnSocketReady
(
unsigned
flags
)
override
;
/* virtual methods from class SocketMonitor */
bool
OnSocketReady
(
unsigned
flags
)
noexcept
override
;
};
#endif
src/event/FullyBufferedSocket.cxx
View file @
59a88369
...
...
@@ -93,7 +93,7 @@ FullyBufferedSocket::Write(const void *data, size_t length)
}
bool
FullyBufferedSocket
::
OnSocketReady
(
unsigned
flags
)
FullyBufferedSocket
::
OnSocketReady
(
unsigned
flags
)
noexcept
{
if
(
flags
&
WRITE
)
{
assert
(
!
output
.
empty
());
...
...
src/event/FullyBufferedSocket.hxx
View file @
59a88369
...
...
@@ -61,7 +61,9 @@ protected:
*/
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
;
};
...
...
src/event/Loop.cxx
View file @
59a88369
...
...
@@ -256,7 +256,7 @@ EventLoop::HandleDeferred()
}
bool
EventLoop
::
OnSocketReady
(
gcc_unused
unsigned
flags
)
EventLoop
::
OnSocketReady
(
gcc_unused
unsigned
flags
)
noexcept
{
assert
(
IsInside
());
...
...
src/event/Loop.hxx
View file @
59a88369
...
...
@@ -188,7 +188,7 @@ private:
*/
void
HandleDeferred
();
virtual
bool
OnSocketReady
(
unsigned
flags
)
override
;
bool
OnSocketReady
(
unsigned
flags
)
noexcept
override
;
public
:
...
...
src/event/MultiSocketMonitor.hxx
View file @
59a88369
...
...
@@ -80,7 +80,7 @@ class MultiSocketMonitor : IdleMonitor
}
protected
:
virtual
bool
OnSocketReady
(
unsigned
flags
)
override
{
bool
OnSocketReady
(
unsigned
flags
)
noexcept
override
{
revents
=
flags
;
multi
.
SetReady
();
return
true
;
...
...
src/event/ServerSocket.cxx
View file @
59a88369
...
...
@@ -115,7 +115,7 @@ public:
void
Accept
()
noexcept
;
private
:
virtual
bool
OnSocketReady
(
unsigned
flags
)
override
;
bool
OnSocketReady
(
unsigned
flags
)
noexcept
override
;
};
static
constexpr
Domain
server_socket_domain
(
"server_socket"
);
...
...
@@ -169,7 +169,7 @@ OneServerSocket::Accept() noexcept
}
bool
OneServerSocket
::
OnSocketReady
(
gcc_unused
unsigned
flags
)
OneServerSocket
::
OnSocketReady
(
gcc_unused
unsigned
flags
)
noexcept
{
Accept
();
return
true
;
...
...
src/event/SignalMonitor.cxx
View file @
59a88369
...
...
@@ -81,7 +81,7 @@ public:
#endif
private
:
virtual
bool
OnSocketReady
(
unsigned
flags
)
override
;
bool
OnSocketReady
(
unsigned
flags
)
noexcept
override
;
};
/* this should be enough - is it? */
...
...
@@ -197,7 +197,7 @@ SignalMonitorRegister(int signo, SignalHandler handler)
}
bool
SignalMonitor
::
OnSocketReady
(
unsigned
)
SignalMonitor
::
OnSocketReady
(
unsigned
)
noexcept
{
#ifdef USE_SIGNALFD
int
signo
;
...
...
src/event/SocketMonitor.cxx
View file @
59a88369
...
...
@@ -30,7 +30,7 @@
#endif
void
SocketMonitor
::
Dispatch
(
unsigned
flags
)
SocketMonitor
::
Dispatch
(
unsigned
flags
)
noexcept
{
flags
&=
GetScheduledFlags
();
...
...
@@ -38,14 +38,14 @@ SocketMonitor::Dispatch(unsigned flags)
Cancel
();
}
SocketMonitor
::~
SocketMonitor
()
SocketMonitor
::~
SocketMonitor
()
noexcept
{
if
(
IsDefined
())
Cancel
();
}
void
SocketMonitor
::
Open
(
SocketDescriptor
_fd
)
SocketMonitor
::
Open
(
SocketDescriptor
_fd
)
noexcept
{
assert
(
!
fd
.
IsDefined
());
assert
(
_fd
.
IsDefined
());
...
...
@@ -54,7 +54,7 @@ SocketMonitor::Open(SocketDescriptor _fd)
}
SocketDescriptor
SocketMonitor
::
Steal
()
SocketMonitor
::
Steal
()
noexcept
{
assert
(
IsDefined
());
...
...
@@ -64,7 +64,7 @@ SocketMonitor::Steal()
}
void
SocketMonitor
::
Abandon
()
SocketMonitor
::
Abandon
()
noexcept
{
assert
(
IsDefined
());
...
...
@@ -73,13 +73,13 @@ SocketMonitor::Abandon()
}
void
SocketMonitor
::
Close
()
SocketMonitor
::
Close
()
noexcept
{
Steal
().
Close
();
}
void
SocketMonitor
::
Schedule
(
unsigned
flags
)
SocketMonitor
::
Schedule
(
unsigned
flags
)
noexcept
{
assert
(
IsDefined
());
...
...
@@ -97,7 +97,7 @@ SocketMonitor::Schedule(unsigned flags)
}
SocketMonitor
::
ssize_t
SocketMonitor
::
Read
(
void
*
data
,
size_t
length
)
SocketMonitor
::
Read
(
void
*
data
,
size_t
length
)
noexcept
{
assert
(
IsDefined
());
...
...
@@ -110,7 +110,7 @@ SocketMonitor::Read(void *data, size_t length)
}
SocketMonitor
::
ssize_t
SocketMonitor
::
Write
(
const
void
*
data
,
size_t
length
)
SocketMonitor
::
Write
(
const
void
*
data
,
size_t
length
)
noexcept
{
assert
(
IsDefined
());
...
...
src/event/SocketMonitor.hxx
View file @
59a88369
...
...
@@ -61,82 +61,82 @@ public:
typedef
std
::
make_signed
<
size_t
>::
type
ssize_t
;
explicit
SocketMonitor
(
EventLoop
&
_loop
)
explicit
SocketMonitor
(
EventLoop
&
_loop
)
noexcept
:
loop
(
_loop
)
{}
SocketMonitor
(
SocketDescriptor
_fd
,
EventLoop
&
_loop
)
SocketMonitor
(
SocketDescriptor
_fd
,
EventLoop
&
_loop
)
noexcept
:
fd
(
_fd
),
loop
(
_loop
)
{}
~
SocketMonitor
();
~
SocketMonitor
()
noexcept
;
EventLoop
&
GetEventLoop
()
{
EventLoop
&
GetEventLoop
()
noexcept
{
return
loop
;
}
bool
IsDefined
()
const
{
bool
IsDefined
()
const
noexcept
{
return
fd
.
IsDefined
();
}
SocketDescriptor
Get
()
const
{
SocketDescriptor
Get
()
const
noexcept
{
assert
(
IsDefined
());
return
fd
;
}
void
Open
(
SocketDescriptor
_fd
);
void
Open
(
SocketDescriptor
_fd
)
noexcept
;
/**
* "Steal" the socket descriptor. This abandons the socket
* and returns it.
*/
SocketDescriptor
Steal
();
SocketDescriptor
Steal
()
noexcept
;
/**
* 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
());
return
scheduled_flags
;
}
void
Schedule
(
unsigned
flags
);
void
Schedule
(
unsigned
flags
)
noexcept
;
void
Cancel
()
{
void
Cancel
()
noexcept
{
Schedule
(
0
);
}
void
ScheduleRead
()
{
void
ScheduleRead
()
noexcept
{
Schedule
(
GetScheduledFlags
()
|
READ
|
HANGUP
|
ERROR
);
}
void
ScheduleWrite
()
{
void
ScheduleWrite
()
noexcept
{
Schedule
(
GetScheduledFlags
()
|
WRITE
);
}
void
CancelRead
()
{
void
CancelRead
()
noexcept
{
Schedule
(
GetScheduledFlags
()
&
~
(
READ
|
HANGUP
|
ERROR
));
}
void
CancelWrite
()
{
void
CancelWrite
()
noexcept
{
Schedule
(
GetScheduledFlags
()
&
~
WRITE
);
}
ssize_t
Read
(
void
*
data
,
size_t
length
);
ssize_t
Write
(
const
void
*
data
,
size_t
length
);
ssize_t
Read
(
void
*
data
,
size_t
length
)
noexcept
;
ssize_t
Write
(
const
void
*
data
,
size_t
length
)
noexcept
;
protected
:
/**
* @return false if the socket has been closed
*/
virtual
bool
OnSocketReady
(
unsigned
flags
)
=
0
;
virtual
bool
OnSocketReady
(
unsigned
flags
)
noexcept
=
0
;
public
:
void
Dispatch
(
unsigned
flags
);
void
Dispatch
(
unsigned
flags
)
noexcept
;
};
#endif
src/lib/curl/Global.cxx
View file @
59a88369
...
...
@@ -65,7 +65,7 @@ public:
curl_socket_t
s
,
int
action
,
void
*
userp
,
void
*
socketp
)
noexcept
;
virtual
bool
OnSocketReady
(
unsigned
flags
)
override
;
bool
OnSocketReady
(
unsigned
flags
)
noexcept
override
;
private
:
static
constexpr
int
FlagsToCurlCSelect
(
unsigned
flags
)
{
...
...
@@ -145,7 +145,7 @@ CurlSocket::SocketFunction(gcc_unused CURL *easy,
}
bool
CurlSocket
::
OnSocketReady
(
unsigned
flags
)
CurlSocket
::
OnSocketReady
(
unsigned
flags
)
noexcept
{
assert
(
GetEventLoop
().
IsInside
());
...
...
src/lib/nfs/Connection.cxx
View file @
59a88369
...
...
@@ -446,7 +446,7 @@ NfsConnection::Service(unsigned flags)
}
bool
NfsConnection
::
OnSocketReady
(
unsigned
flags
)
NfsConnection
::
OnSocketReady
(
unsigned
flags
)
noexcept
{
assert
(
GetEventLoop
().
IsInside
());
assert
(
deferred_close
.
empty
());
...
...
src/lib/nfs/Connection.hxx
View file @
59a88369
...
...
@@ -230,7 +230,7 @@ private:
int
Service
(
unsigned
flags
);
/* virtual methods from SocketMonitor */
virtual
bool
OnSocketReady
(
unsigned
flags
)
override
;
bool
OnSocketReady
(
unsigned
flags
)
noexcept
override
;
/* callback for #mount_timeout_event */
void
OnMountTimeout
();
...
...
src/output/plugins/httpd/HttpdClient.cxx
View file @
59a88369
...
...
@@ -403,7 +403,7 @@ HttpdClient::PushMetaData(PagePtr page)
}
bool
HttpdClient
::
OnSocketReady
(
unsigned
flags
)
HttpdClient
::
OnSocketReady
(
unsigned
flags
)
noexcept
{
if
(
!
BufferedSocket
::
OnSocketReady
(
flags
))
return
false
;
...
...
src/output/plugins/httpd/HttpdClient.hxx
View file @
59a88369
...
...
@@ -191,7 +191,9 @@ private:
void
ClearQueue
();
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
;
void
OnSocketError
(
std
::
exception_ptr
ep
)
override
;
virtual
void
OnSocketClosed
()
override
;
...
...
src/zeroconf/AvahiPoll.cxx
View file @
59a88369
...
...
@@ -69,8 +69,9 @@ public:
delete
w
;
}
protected
:
virtual
bool
OnSocketReady
(
unsigned
flags
)
{
private
:
/* virtual methods from class SocketMonitor */
bool
OnSocketReady
(
unsigned
flags
)
noexcept
{
received
=
ToAvahiWatchEvent
(
flags
);
callback
(
this
,
Get
().
Get
(),
received
,
userdata
);
received
=
AvahiWatchEvent
(
0
);
...
...
src/zeroconf/ZeroconfBonjour.cxx
View file @
59a88369
...
...
@@ -48,7 +48,8 @@ public:
}
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
);
return
false
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment