AxioDL
/
jbus
mirror of https://github.com/AxioDL/jbus.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7 from lioncash/assignment 

Listener: Simplify assignment within accept()
This commit is contained in:
Phillip Stephens 2019-09-03 19:54:45 -07:00 committed by GitHub
parent ebe78edac7 33908dd86a
commit fb3d880b63
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/Listener.cpp
View File

@ -68,7 +68,7 @@ void Listener::listenerProc() {
#endif #endif
} }
if (acceptData && acceptClock) { if (acceptData && acceptClock) {
std::unique_lock<std::mutex> lk(m_queueLock); std::unique_lock lk{m_queueLock};
m_endpointQueue.push(std::make_unique<Endpoint>(0, std::move(acceptData), std::move(acceptClock))); m_endpointQueue.push(std::make_unique<Endpoint>(0, std::move(acceptData), std::move(acceptClock)));
} }
WaitGCTicks(GetGCTicksPerSec()); WaitGCTicks(GetGCTicksPerSec());
@ -94,14 +94,14 @@ void Listener::stop() {
} }
std::unique_ptr<Endpoint> Listener::accept() { std::unique_ptr<Endpoint> Listener::accept() {
std::unique_lock<std::mutex> lk(m_queueLock); std::unique_lock lk{m_queueLock};
if (m_endpointQueue.size()) { if (m_endpointQueue.empty()) {
std::unique_ptr<Endpoint> ret; return nullptr;
ret = std::move(m_endpointQueue.front());
m_endpointQueue.pop();
return ret;
} }
return {};
auto ret = std::move(m_endpointQueue.front());
m_endpointQueue.pop();
return ret;
} }
Listener::Listener() = default; Listener::Listener() = default;