MXS-1775 Monitor stopping moved to maxscale::MonitorInstance

2018-05-16 11:20:50 +03:00
parent 1304fd6147
commit bcb7d09a15
12 changed files with 15 additions and 85 deletions
--- a/server/core/monitor.cc
+++ b/server/core/monitor.cc
@ -2522,6 +2522,19 @@ MonitorInstance::~MonitorInstance()
    ss_dassert(!m_script);
 }

+void MonitorInstance::stop()
+{
+    ss_dassert(m_thread);
+
+    atomic_store_int32(&m_shutdown, 1);
+    thread_wait(m_thread);
+    m_thread = 0;
+    m_shutdown = 0;
+
+    MXS_FREE(m_script);
+    m_script = NULL;
+}
+
 //static
 void MonitorInstance::main(void* pArg)
 {