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

Change monitor ticks to atomic_long

Browse Source 
The original atomic_int64_t was not supported on older compilers.
This commit is contained in:
Esa Korhonen 2019-05-14 13:55:15 +03:00
parent 4ed8726ccf
commit 884b5ea706
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/maxscale/monitor.hh
View File

@ -333,7 +333,7 @@ public:
*/
const MXS_CONFIG_PARAMETER& parameters() const;
int64_t ticks() const;
long ticks() const;
/**
* Starts the monitor. If the monitor requires polling of the servers, it should create
@ -556,7 +556,7 @@ protected:
const Settings& settings() const;
/**< Number of monitor ticks ran. Derived classes should increment this whenever completing a tick. */
std::atomic_int64_t m_ticks {0};
std::atomic_long m_ticks {0};
private:

4
server/core/monitor.cc
View File

@ -596,7 +596,7 @@ const Monitor::Settings& Monitor::settings() const
return m_settings;
}
int64_t Monitor::ticks() const
long Monitor::ticks() const
{
return m_ticks.load(std::memory_order_acquire);
}
@ -669,7 +669,7 @@ void Monitor::show(DCB* dcb)
{
dcb_printf(dcb, "Name: %s\n", name());
dcb_printf(dcb, "State: %s\n", monitor_state_to_string(state()));
dcb_printf(dcb, "Times monitored: %lu\n", ticks());
dcb_printf(dcb, "Times monitored: %li\n", ticks());
dcb_printf(dcb, "Sampling interval: %lu milliseconds\n", m_settings.interval);
dcb_printf(dcb, "Connect Timeout: %i seconds\n", m_settings.conn_settings.connect_timeout);
dcb_printf(dcb, "Read Timeout: %i seconds\n", m_settings.conn_settings.read_timeout);

2
server/core/monitormanager.cc
View File

@ -127,7 +127,7 @@ void MonitorManager::debug_wait_one_tick()
{
mxb_assert(Monitor::is_admin_thread());
using namespace std::chrono;
std::map<Monitor*, int64_t> ticks;
std::map<Monitor*, long> ticks;
// Get tick values for all monitors
this_unit.foreach_monitor([&ticks](Monitor* mon) {