More subscriptions, less notifiers.

[stg.git] / projects / stargazer / plugins / other / ping / ping.cpp

diff --git a/projects/stargazer/plugins/other/ping/ping.cpp b/projects/stargazer/plugins/other/ping/ping.cpp
index 147ef68ce341da4a140ab01582180aad978c0789..71752de60719ef461981f9f060dc2d85ebc29a8f 100644 (file)
--- a/projects/stargazer/plugins/other/ping/ping.cpp
+++ b/projects/stargazer/plugins/other/ping/ping.cpp
@@ -50,7 +50,7 @@ if (pvi == s.moduleParams.end() || pvi->value.empty())
     printfd(__FILE__, "Parameter 'PingDelay' not found\n");
     return -1;
     }
-if (ParseIntInRange(pvi->value[0], 5, 3600, &pingDelay))
+if (ParseIntInRange(pvi->value[0], 5, 3600, &pingDelay) != 0)
     {
     errorStr = "Cannot parse parameter \'PingDelay\': " + errorStr;
     printfd(__FILE__, "Canot parse parameter 'PingDelay'\n");
@@ -61,25 +61,16 @@ return 0;
 }
 //-----------------------------------------------------------------------------
 PING::PING()
-    : users(NULL),
-      nonstop(false),
+    : users(nullptr),
       isRunning(false),
-      onAddUserNotifier(*this),
-      onDelUserNotifier(*this),
       logger(STG::PluginLogger::get("ping"))
 {
-pthread_mutex_init(&mutex, NULL);
-}
-//-----------------------------------------------------------------------------
-PING::~PING()
-{
-pthread_mutex_destroy(&mutex);
 }
 //-----------------------------------------------------------------------------
 int PING::ParseSettings()
 {
-int ret = pingSettings.ParseSettings(settings);
-if (ret)
+auto ret = pingSettings.ParseSettings(settings);
+if (ret != 0)
     errorStr = pingSettings.GetStrError();
 return ret;
 }
@@ -88,34 +79,26 @@ int PING::Start()
 {
 GetUsers();
 
-users->AddNotifierUserAdd(&onAddUserNotifier);
-users->AddNotifierUserDel(&onDelUserNotifier);
-
-nonstop = true;
+m_onAddUserConn = users->onAdd([this](auto user){ AddUser(user); });
+m_onDelUserConn = users->onDel([this](auto user){ DelUser(user); });
 
 pinger.SetDelayTime(pingSettings.GetPingDelay());
 pinger.Start();
 
-if (pthread_create(&thread, NULL, Run, this))
-    {
-    errorStr = "Cannot start thread.";
-    logger("Cannot create thread.");
-    printfd(__FILE__, "Cannot start thread\n");
-    return -1;
-    }
+m_thread = std::jthread([this](auto token){ Run(std::move(token)); });
 
 return 0;
 }
 //-----------------------------------------------------------------------------
 int PING::Stop()
 {
-STG_LOCKER lock(&mutex);
+std::lock_guard lock(m_mutex);
 
-if (!isRunning)
+if (!m_thread.joinable())
     return 0;
 
 pinger.Stop();
-nonstop = false;
+m_thread.request_stop();
 //5 seconds to thread stops itself
 struct timespec ts = {0, 200000000};
 for (int i = 0; i < 25; i++)
@@ -123,11 +106,11 @@ for (int i = 0; i < 25; i++)
     if (!isRunning)
         break;
 
-    nanosleep(&ts, NULL);
+    nanosleep(&ts, nullptr);
     }
 
-users->DelNotifierUserAdd(&onAddUserNotifier);
-users->DelNotifierUserDel(&onDelUserNotifier);
+m_onAddUserConn.disconnect();
+m_onDelUserConn.disconnect();
 
 std::list<UserPtr>::iterator users_iter;
 users_iter = usersList.begin();
@@ -138,7 +121,9 @@ while (users_iter != usersList.end())
     }
 
 if (isRunning)
-    return -1;
+    m_thread.detach();
+else
+    m_thread.join();
 
 return 0;
 }
@@ -148,43 +133,42 @@ bool PING::IsRunning()
 return isRunning;
 }
 //-----------------------------------------------------------------------------
-void * PING::Run(void * d)
+void PING::Run(std::stop_token token)
 {
 sigset_t signalSet;
 sigfillset(&signalSet);
-pthread_sigmask(SIG_BLOCK, &signalSet, NULL);
+pthread_sigmask(SIG_BLOCK, &signalSet, nullptr);
 
-PING * ping = static_cast<PING *>(d);
-ping->isRunning = true;
+isRunning = true;
 
-long delay = (10000000 * ping->pingSettings.GetPingDelay()) / 3 + 50000000;
+long delay = (10000000 * pingSettings.GetPingDelay()) / 3 + 50000000;
 
-while (ping->nonstop)
+while (!token.stop_requested())
     {
-    std::list<UserPtr>::iterator iter = ping->usersList.begin();
+    auto iter = usersList.begin();
         {
-        STG_LOCKER lock(&ping->mutex);
-        while (iter != ping->usersList.end())
+        std::lock_guard lock(m_mutex);
+        while (iter != usersList.end())
             {
             if ((*iter)->GetProperties().ips.ConstData().onlyOneIP())
                 {
                 uint32_t ip = (*iter)->GetProperties().ips.ConstData()[0].ip;
                 time_t t;
-                if (ping->pinger.GetIPTime(ip, &t) == 0)
+                if (pinger.GetIPTime(ip, &t) == 0)
                     {
-                    if (t)
+                    if (t != 0)
                         (*iter)->UpdatePingTime(t);
                     }
                 }
             else
                 {
                 uint32_t ip = (*iter)->GetCurrIP();
-                if (ip)
+                if (ip != 0)
                     {
                     time_t t;
-                    if (ping->pinger.GetIPTime(ip, &t) == 0)
+                    if (pinger.GetIPTime(ip, &t) == 0)
                         {
-                        if (t)
+                        if (t != 0)
                             (*iter)->UpdatePingTime(t);
                         }
                     }
@@ -195,15 +179,14 @@ while (ping->nonstop)
     struct timespec ts = {delay / 1000000000, delay % 1000000000};
     for (int i = 0; i < 100; i++)
         {
-        if (ping->nonstop)
+        if (!token.stop_requested())
             {
-            nanosleep(&ts, NULL);
+            nanosleep(&ts, nullptr);
             }
         }
     }
 
-ping->isRunning = false;
-return NULL;
+isRunning = false;
 }
 //-----------------------------------------------------------------------------
 void PING::SetUserNotifiers(UserPtr u)
@@ -253,7 +236,7 @@ if (IPIter != ChgIPNotifierList.end())
 //-----------------------------------------------------------------------------
 void PING::GetUsers()
 {
-STG_LOCKER lock(&mutex);
+std::lock_guard lock(m_mutex);
 
 UserPtr u;
 int h = users->OpenSearch();
@@ -270,7 +253,7 @@ while (users->SearchNext(h, &u) == 0)
     else
         {
         uint32_t ip = u->GetCurrIP();
-        if (ip)
+        if (ip != 0)
             pinger.AddIP(ip);
         }
     }
@@ -280,7 +263,7 @@ users->CloseSearch(h);
 //-----------------------------------------------------------------------------
 void PING::AddUser(UserPtr u)
 {
-STG_LOCKER lock(&mutex);
+std::lock_guard lock(m_mutex);
 
 SetUserNotifiers(u);
 usersList.push_back(u);
@@ -288,7 +271,7 @@ usersList.push_back(u);
 //-----------------------------------------------------------------------------
 void PING::DelUser(UserPtr u)
 {
-STG_LOCKER lock(&mutex);
+std::lock_guard lock(m_mutex);
 
 UnSetUserNotifiers(u);
 
@@ -306,14 +289,14 @@ while (users_iter != usersList.end())
     }
 }
 //-----------------------------------------------------------------------------
-void CHG_CURRIP_NOTIFIER_PING::Notify(const uint32_t & oldIP, const uint32_t & newIP)
+void CHG_CURRIP_NOTIFIER_PING::notify(const uint32_t & oldIP, const uint32_t & newIP)
 {
 ping.pinger.DelIP(oldIP);
-if (newIP)
+if (newIP != 0)
     ping.pinger.AddIP(newIP);
 }
 //-----------------------------------------------------------------------------
-void CHG_IPS_NOTIFIER_PING::Notify(const STG::UserIPs & oldIPS, const STG::UserIPs & newIPS)
+void CHG_IPS_NOTIFIER_PING::notify(const STG::UserIPs & oldIPS, const STG::UserIPs & newIPS)
 {
 if (oldIPS.onlyOneIP())
     ping.pinger.DelIP(oldIPS[0].ip);
@@ -321,14 +304,3 @@ if (oldIPS.onlyOneIP())
 if (newIPS.onlyOneIP())
     ping.pinger.AddIP(newIPS[0].ip);
 }
-//-----------------------------------------------------------------------------
-void ADD_USER_NONIFIER_PING::Notify(const UserPtr & user)
-{
-ping.AddUser(user);
-}
-//-----------------------------------------------------------------------------
-void DEL_USER_NONIFIER_PING::Notify(const UserPtr & user)
-{
-ping.DelUser(user);
-}
-//-----------------------------------------------------------------------------