hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MXS-2067: Remove spinlock.hh

Browse Source 
Replaced the C++ versions with standard library mutexes.
This commit is contained in:
Markus Mäkelä
2018-09-26 00:02:06 +03:00
parent fc1e36429c
commit 50451166bb
15 changed files with 84 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
server/modules/routing/schemarouter/shard_map.cc
View File

@ -172,7 +172,6 @@ bool Shard::newer_than(const Shard& shard) const
ShardManager::ShardManager()
{
spinlock_init(&m_lock);
}
ShardManager::~ShardManager()
@ -181,7 +180,7 @@ ShardManager::~ShardManager()
Shard ShardManager::get_shard(std::string user, double max_interval)
{
mxs::SpinLockGuard guard(m_lock);
std::lock_guard<std::mutex> guard(m_lock);
ShardMap::iterator iter = m_maps.find(user);
@ -203,7 +202,7 @@ Shard ShardManager::get_shard(std::string user, double max_interval)
void ShardManager::update_shard(Shard& shard, std::string user)
{
mxs::SpinLockGuard guard(m_lock);
std::lock_guard<std::mutex> guard(m_lock);
ShardMap::iterator iter = m_maps.find(user);
if (iter == m_maps.end() || shard.newer_than(iter->second))

10
server/modules/routing/schemarouter/shard_map.hh
View File

@ -14,12 +14,12 @@
#include <maxscale/ccdefs.hh>
#include <unordered_map>
#include <string>
#include <list>
#include <mutex>
#include <string>
#include <unordered_map>
#include <maxscale/service.h>
#include <maxscale/spinlock.hh>
using namespace maxscale;
@ -142,6 +142,6 @@ public:
void update_shard(Shard& shard, std::string user);
private:
SPINLOCK m_lock;
ShardMap m_maps;
mutable std::mutex m_lock;
ShardMap m_maps;
};