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

input/thread: add "noexcept"

Browse Source
This commit is contained in:
Max Kellermann
2018-01-20 18:53:18 +01:00
parent 30832ab33a
commit e0a09dbd69
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/input/ThreadInputStream.cxx
View File

@@ -27,7 +27,7 @@
ThreadInputStream::ThreadInputStream(const char *_plugin, ThreadInputStream::ThreadInputStream(const char *_plugin,
const char *_uri, const char *_uri,
Mutex &_mutex, Cond &_cond, Mutex &_mutex, Cond &_cond,
size_t _buffer_size) size_t _buffer_size) noexcept
:InputStream(_uri, _mutex, _cond), :InputStream(_uri, _mutex, _cond),
plugin(_plugin), plugin(_plugin),
thread(BIND_THIS_METHOD(ThreadFunc)), thread(BIND_THIS_METHOD(ThreadFunc)),
@@ -37,7 +37,7 @@ ThreadInputStream::ThreadInputStream(const char *_plugin,
allocation.ForkCow(false); allocation.ForkCow(false);
} }
ThreadInputStream::~ThreadInputStream() ThreadInputStream::~ThreadInputStream() noexcept
{ {
{ {
const std::lock_guard<Mutex> lock(mutex); const std::lock_guard<Mutex> lock(mutex);
@@ -58,8 +58,8 @@ ThreadInputStream::Start()
thread.Start(); thread.Start();
} }
void inline void
ThreadInputStream::ThreadFunc() ThreadInputStream::ThreadFunc() noexcept
{ {
FormatThreadName("input:%s", plugin); FormatThreadName("input:%s", plugin);

12
src/input/ThreadInputStream.hxx
View File

@@ -71,9 +71,9 @@ class ThreadInputStream : public InputStream {
public: public:
ThreadInputStream(const char *_plugin, ThreadInputStream(const char *_plugin,
const char *_uri, Mutex &_mutex, Cond &_cond, const char *_uri, Mutex &_mutex, Cond &_cond,
size_t _buffer_size); size_t _buffer_size) noexcept;
virtual ~ThreadInputStream(); virtual ~ThreadInputStream() noexcept;
/** /**
* Initialize the object and start the thread. * Initialize the object and start the thread.
@@ -87,7 +87,7 @@ public:
size_t Read(void *ptr, size_t size) override final; size_t Read(void *ptr, size_t size) override final;
protected: protected:
void SetMimeType(const char *_mime) { void SetMimeType(const char *_mime) noexcept {
assert(thread.IsInside()); assert(thread.IsInside());
InputStream::SetMimeType(_mime); InputStream::SetMimeType(_mime);
@@ -124,7 +124,7 @@ protected:
* *
* The #InputStream is not locked. * The #InputStream is not locked.
*/ */
virtual void Close() {} virtual void Close() noexcept {}
/** /**
* Called from the client thread to cancel a Read() inside the * Called from the client thread to cancel a Read() inside the
@@ -132,10 +132,10 @@ protected:
* *
* The #InputStream is not locked. * The #InputStream is not locked.
*/ */
virtual void Cancel() {} virtual void Cancel() noexcept {}
private: private:
void ThreadFunc(); void ThreadFunc() noexcept;
}; };
#endif #endif

2
src/input/plugins/MmsInputPlugin.cxx
View File

@@ -43,7 +43,7 @@ protected:
virtual void Open() override; virtual void Open() override;
virtual size_t ThreadRead(void *ptr, size_t size) override; virtual size_t ThreadRead(void *ptr, size_t size) override;
void Close() override { void Close() noexcept override {
mmsx_close(mms); mmsx_close(mms);
} }
}; };