Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add LockGuard class #49

Merged
merged 3 commits into from
Jun 4, 2019
Merged

Add LockGuard class #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b0c8e2f
+ Add LockGuard class
noSTALKER May 24, 2019
6856649
Merge branch 'master' into add_lock__guard
MaggieQi Jun 4, 2019
a4c2826
Merge branch 'master' into add_lock__guard
MaggieQi Jun 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 22 additions & 0 deletions AnnService/inc/Helper/Concurrent.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,28 @@ class SpinLock
std::atomic_flag m_lock = ATOMIC_FLAG_INIT;
};

template<typename Lock>
class LockGuard {
public:
LockGuard(Lock& lock) noexcept
: m_lock(lock) {
lock.Lock();
}

LockGuard(Lock& lock, std::adopt_lock_t) noexcept
: m_lock(lock) {}

~LockGuard() {
m_lock.Unlock();
}

LockGuard(const LockGuard&) = delete;
LockGuard& operator=(const LockGuard&) = delete;

private:
Lock& m_lock;
};


class WaitSignal
{
Expand Down
25 changes: 13 additions & 12 deletions AnnService/src/Socket/ConnectionManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,10 @@ ConnectionManager::AddConnection(boost::asio::ip::tcp::socket&& p_socket,
p_handler,
std::weak_ptr<ConnectionManager>(shared_from_this()));

m_spinLock.Lock();
m_connections[GetPosition(currID)].m_connection = connection;
m_spinLock.Unlock();
{
Helper::Concurrent::LockGuard<Helper::Concurrent::SpinLock> guard(m_spinLock);
m_connections[GetPosition(currID)].m_connection = connection;
}

connection->Start();
if (p_heartbeatIntervalSeconds > 0)
Expand All @@ -67,9 +68,10 @@ ConnectionManager::RemoveConnection(ConnectionID p_connectionID)

Connection::Ptr conn;

m_spinLock.Lock();
conn = std::move(m_connections[position].m_connection);
m_spinLock.Unlock();
{
Helper::Concurrent::LockGuard<Helper::Concurrent::SpinLock> guard(m_spinLock);
conn = std::move(m_connections[position].m_connection);
}

--m_connectionCount;

Expand All @@ -89,9 +91,10 @@ ConnectionManager::GetConnection(ConnectionID p_connectionID)
auto position = GetPosition(p_connectionID);
Connection::Ptr ret;

m_spinLock.Lock();
ret = m_connections[position].m_connection;
m_spinLock.Unlock();
{
Helper::Concurrent::LockGuard<Helper::Concurrent::SpinLock> guard(m_spinLock);
ret = m_connections[position].m_connection;
}

if (nullptr == ret || ret->GetConnectionID() != p_connectionID)
{
Expand All @@ -112,16 +115,14 @@ ConnectionManager::SetEventOnRemoving(std::function<void(ConnectionID)> p_event)
void
ConnectionManager::StopAll()
{
m_spinLock.Lock();
Helper::Concurrent::LockGuard<Helper::Concurrent::SpinLock> guard(m_spinLock);
for (auto& connection : m_connections)
{
if (nullptr != connection.m_connection)
{
connection.m_connection->Stop();
}
}

m_spinLock.Unlock();
}


Expand Down