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

MXS-1632: Take mxb::atomic::add into use

Browse Source 
The function now mostly replaces the use of atomic_add_ functions declared
in atomic.h.
This commit is contained in:
Markus Mäkelä
2018-09-17 13:32:49 +03:00
parent 4d792c3410
commit 2e069fa892
20 changed files with 104 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/modules/routing/readwritesplit/rwsplit_mysql.cc
View File

@ -131,7 +131,7 @@ bool RWSplitSession::handle_target_is_all(route_target_t route_target,
else if (route_session_write(gwbuf_clone(querybuf), packet_type, qtype))
{
result = true;
atomic_add_uint64(&m_router->stats().n_all, 1);
mxb::atomic::add(&m_router->stats().n_all, 1, mxb::atomic::RELAXED);
}
m_qc.set_large_query(is_large);

10
server/modules/routing/readwritesplit/rwsplit_route_stmt.cc
View File

@ -438,7 +438,7 @@ bool RWSplitSession::route_session_write(GWBUF* querybuf, uint8_t command, uint3
if (backend->execute_session_command())
{
nsucc += 1;
atomic_add_uint64(&backend->server()->stats.packets, 1);
mxb::atomic::add(&backend->server()->stats.packets, 1, mxb::atomic::RELAXED);
m_router->server_stats(backend->server()).total++;
m_router->server_stats(backend->server()).read++;
@ -805,7 +805,7 @@ SRWBackend RWSplitSession::handle_slave_is_target(uint8_t cmd, uint32_t stmt_id)
if (target)
{
atomic_add_uint64(&m_router->stats().n_slave, 1);
mxb::atomic::add(&m_router->stats().n_slave, 1, mxb::atomic::RELAXED);
m_router->server_stats(target->server()).read++;
mxb_assert(target->in_use() || target->can_connect());
}
@ -938,7 +938,7 @@ bool RWSplitSession::handle_master_is_target(SRWBackend* dest)
if (target && target == m_current_master)
{
atomic_add_uint64(&m_router->stats().n_master, 1);
mxb::atomic::add(&m_router->stats().n_master, 1, mxb::atomic::RELAXED);
m_router->server_stats(target->server()).write++;
}
else
@ -1092,8 +1092,8 @@ bool RWSplitSession::handle_got_target(GWBUF* querybuf, SRWBackend& target, bool
m_current_query.copy_from(querybuf);
}
atomic_add_uint64(&m_router->stats().n_queries, 1);
atomic_add_uint64(&target->server()->stats.packets, 1);
mxb::atomic::add(&m_router->stats().n_queries, 1, mxb::atomic::RELAXED);
mxb::atomic::add(&target->server()->stats.packets, 1, mxb::atomic::RELAXED);
m_router->server_stats(target->server()).total++;
if (!m_qc.large_query())

2
server/modules/routing/readwritesplit/rwsplitsession.cc
View File

@ -421,7 +421,7 @@ void RWSplitSession::trx_replay_next_stmt()
{
// No more statements to execute
m_is_replay_active = false;
atomic_add_uint64(&m_router->stats().n_trx_replay, 1);
mxb::atomic::add(&m_router->stats().n_trx_replay, 1, mxb::atomic::RELAXED);
if (!m_replayed_trx.empty())
{

9
server/modules/routing/readwritesplit/rwsplitsession.hh
View File

@ -289,10 +289,11 @@ private:
{
if (session_trx_is_ending(m_client->session))
{
atomic_add_uint64(m_qc.is_trx_still_read_only()
? &m_router->stats().n_ro_trx
: &m_router->stats().n_rw_trx,
1);
mxb::atomic::add(m_qc.is_trx_still_read_only()
? &m_router->stats().n_ro_trx
: &m_router->stats().n_rw_trx,
1,
mxb::atomic::RELAXED);
}
}
};