More std::jthread stuff.

[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 c65a5cbaff805ea9f96f36057e9f277ed63cca5b..2cbd1f8b12c5da83ccb79410084e74a79021c509 100644 (file)
--- a/projects/stargazer/plugins/other/ping/ping.cpp
+++ b/projects/stargazer/plugins/other/ping/ping.cpp
@@ -1,62 +1,45 @@
+#include "ping.h"
+
+#include "stg/user.h"
+#include "stg/locker.h"
+#include "stg/user_property.h"
+
+#include <algorithm>

 #include <cstdio>
 #include <cassert>
 #include <csignal>
 #include <ctime>
 #include <cstdio>
 #include <cassert>
 #include <csignal>
 #include <ctime>

-#include <algorithm>

 
 

-#include "stg/user.h"
-#include "stg/locker.h"
-#include "stg/user_property.h"
-#include "stg/plugin_creator.h"
-#include "ping.h"
+using STG::PING;
+using STG::PING_SETTINGS;

 
 namespace
 {
 
 namespace
 {

-PLUGIN_CREATOR<PING> pc;

 
 

-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-// ëÌÁÓÓ ÄÌÑ ÐÏÉÓËÁ ÀÚÅÒÁ × ÓÐÉÓËÅ ÎÏÔÉÆÉËÁÔÏÒÏ×
-template <typename varType>
-class IS_CONTAINS_USER: public std::binary_function<varType, USER_PTR, bool>
+extern "C" STG::Plugin* GetPlugin()

 {
 {

-public:
-    IS_CONTAINS_USER(const USER_PTR & u) : user(u) {}
-    bool operator()(varType notifier) const
-        {
-        return notifier.GetUser() == user;
-        }
-private:
-    const USER_PTR & user;
-};
+    static PING plugin;
+    return &plugin;

 }
 
 }
 

-extern "C" PLUGIN * GetPlugin();
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-PLUGIN * GetPlugin()
-{
-return pc.GetPlugin();

 }
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 }
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------

-int PING_SETTINGS::ParseSettings(const MODULE_SETTINGS & s)
+int PING_SETTINGS::ParseSettings(const ModuleSettings & s)

 {
 {

-PARAM_VALUE pv;
-std::vector<PARAM_VALUE>::const_iterator pvi;
+ParamValue pv;
+std::vector<ParamValue>::const_iterator pvi;

 
 pv.param = "PingDelay";
 pvi = std::find(s.moduleParams.begin(), s.moduleParams.end(), pv);
 
 pv.param = "PingDelay";
 pvi = std::find(s.moduleParams.begin(), s.moduleParams.end(), pv);

-if (pvi == s.moduleParams.end())
+if (pvi == s.moduleParams.end() || pvi->value.empty())

     {
     errorStr = "Parameter \'PingDelay\' not found.";
     printfd(__FILE__, "Parameter 'PingDelay' not found\n");
     return -1;
     }
     {
     errorStr = "Parameter \'PingDelay\' not found.";
     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");
     {
     errorStr = "Cannot parse parameter \'PingDelay\': " + errorStr;
     printfd(__FILE__, "Canot parse parameter 'PingDelay'\n");


@@ -67,34 +50,16 @@ return 0;
 }
 //-----------------------------------------------------------------------------
 PING::PING()
 }
 //-----------------------------------------------------------------------------
 PING::PING()

-    : errorStr(),
-      pingSettings(),
-      settings(),
-      users(NULL),
-      usersList(),
-      thread(),
-      mutex(),
-      nonstop(false),
+    : users(nullptr),

       isRunning(false),
       isRunning(false),

-      pinger(),
-      ChgCurrIPNotifierList(),
-      ChgIPNotifierList(),
-      onAddUserNotifier(*this),
-      onDelUserNotifier(*this),
-      logger(GetPluginLogger(GetStgLogger(), "ping"))
-{
-pthread_mutex_init(&mutex, NULL);
-}
-//-----------------------------------------------------------------------------
-PING::~PING()
+      logger(PluginLogger::get("ping"))

 {
 {

-pthread_mutex_destroy(&mutex);

 }
 //-----------------------------------------------------------------------------
 int PING::ParseSettings()
 {
 }
 //-----------------------------------------------------------------------------
 int PING::ParseSettings()
 {

-int ret = pingSettings.ParseSettings(settings);
-if (ret)
+auto ret = pingSettings.ParseSettings(settings);
+if (ret != 0)

     errorStr = pingSettings.GetStrError();
 return ret;
 }
     errorStr = pingSettings.GetStrError();
 return ret;
 }


@@ -103,34 +68,26 @@ int PING::Start()
 {
 GetUsers();
 
 {
 GetUsers();
 

-users->AddNotifierUserAdd(&onAddUserNotifier);
-users->AddNotifierUserDel(&onDelUserNotifier);
+m_onAddUserConn = users->onAdd([this](auto user){ AddUser(user); });
+m_onDelUserConn = users->onDel([this](auto user){ DelUser(user); });

 
 

-nonstop = true;
+m_pinger.SetDelayTime(pingSettings.GetPingDelay());
+m_pinger.Start();

 
 

-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()
 {
 
 return 0;
 }
 //-----------------------------------------------------------------------------
 int PING::Stop()
 {

-STG_LOCKER lock(&mutex);
+std::lock_guard lock(m_mutex);

 
 

-if (!isRunning)
+if (!m_thread.joinable())

     return 0;
 
     return 0;
 

-pinger.Stop();
-nonstop = false;
+m_pinger.Stop();
+m_thread.request_stop();

 //5 seconds to thread stops itself
 struct timespec ts = {0, 200000000};
 for (int i = 0; i < 25; i++)
 //5 seconds to thread stops itself
 struct timespec ts = {0, 200000000};
 for (int i = 0; i < 25; i++)


@@ -138,22 +95,18 @@ for (int i = 0; i < 25; i++)
     if (!isRunning)
         break;
 
     if (!isRunning)
         break;
 

-    nanosleep(&ts, NULL);
+    nanosleep(&ts, nullptr);

     }
 
     }
 

-users->DelNotifierUserAdd(&onAddUserNotifier);
-users->DelNotifierUserDel(&onDelUserNotifier);
+m_onAddUserConn.disconnect();
+m_onDelUserConn.disconnect();

 
 

-std::list<USER_PTR>::iterator users_iter;
-users_iter = usersList.begin();
-while (users_iter != usersList.end())
-    {
-    UnSetUserNotifiers(*users_iter);
-    ++users_iter;
-    }
+m_conns.clear();

 
 if (isRunning)
 
 if (isRunning)

-    return -1;
+    m_thread.detach();
+else
+    m_thread.join();

 
 return 0;
 }
 
 return 0;
 }


@@ -163,43 +116,42 @@ bool PING::IsRunning()
 return isRunning;
 }
 //-----------------------------------------------------------------------------
 return isRunning;
 }
 //-----------------------------------------------------------------------------

-void * PING::Run(void * d)
+void PING::Run(std::stop_token token)

 {
 sigset_t signalSet;
 sigfillset(&signalSet);
 {
 sigset_t signalSet;
 sigfillset(&signalSet);

-pthread_sigmask(SIG_BLOCK, &signalSet, NULL);
+pthread_sigmask(SIG_BLOCK, &signalSet, nullptr);
+
+isRunning = true;

 
 

-PING * ping = static_cast<PING *>(d);
-ping->isRunning = true;
+long delay = (10000000 * pingSettings.GetPingDelay()) / 3 + 50000000;

 
 

-long delay = (10000000 * ping->pingSettings.GetPingDelay()) / 3 + 50000000;
- 
-while (ping->nonstop)
+while (!token.stop_requested())

     {
     {

-    std::list<USER_PTR>::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)->GetProperty().ips.ConstData().OnlyOneIP())
+            if ((*iter)->GetProperties().ips.ConstData().onlyOneIP())

                 {
                 {

-                uint32_t ip = (*iter)->GetProperty().ips.ConstData()[0].ip;
+                uint32_t ip = (*iter)->GetProperties().ips.ConstData()[0].ip;

                 time_t t;
                 time_t t;

-                if (ping->pinger.GetIPTime(ip, &t) == 0)
+                if (m_pinger.GetIPTime(ip, t) == 0)

                     {
                     {

-                    if (t)
+                    if (t != 0)

                         (*iter)->UpdatePingTime(t);
                     }
                 }
             else
                 {
                 uint32_t ip = (*iter)->GetCurrIP();
                         (*iter)->UpdatePingTime(t);
                     }
                 }
             else
                 {
                 uint32_t ip = (*iter)->GetCurrIP();

-                if (ip)
+                if (ip != 0)

                     {
                     time_t t;
                     {
                     time_t t;

-                    if (ping->pinger.GetIPTime(ip, &t) == 0)
+                    if (m_pinger.GetIPTime(ip, t) == 0)

                         {
                         {

-                        if (t)
+                        if (t != 0)

                             (*iter)->UpdatePingTime(t);
                         }
                     }
                             (*iter)->UpdatePingTime(t);
                         }
                     }


@@ -210,67 +162,37 @@ while (ping->nonstop)
     struct timespec ts = {delay / 1000000000, delay % 1000000000};
     for (int i = 0; i < 100; i++)
         {
     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(USER_PTR u)
+void PING::SetUserNotifiers(UserPtr u)

 {
 {

-CHG_CURRIP_NOTIFIER_PING ChgCurrIPNotifier(*this, u);
-CHG_IPS_NOTIFIER_PING ChgIPNotifier(*this, u);
-
-ChgCurrIPNotifierList.push_front(ChgCurrIPNotifier);
-ChgIPNotifierList.push_front(ChgIPNotifier);
-
-u->AddCurrIPAfterNotifier(&(*ChgCurrIPNotifierList.begin()));
-u->GetProperty().ips.AddAfterNotifier(&(*ChgIPNotifierList.begin()));
+    m_conns.emplace_back(
+        u->GetID(),
+        u->afterCurrIPChange([this](auto oldVal, auto newVal){ updateCurrIP(oldVal, newVal); }),
+        u->GetProperties().ips.afterChange([this](const auto& oldVal, const auto& newVal){ updateIPs(oldVal, newVal); })
+    );

 }
 //-----------------------------------------------------------------------------
 }
 //-----------------------------------------------------------------------------

-void PING::UnSetUserNotifiers(USER_PTR u)
+void PING::UnSetUserNotifiers(UserPtr u)

 {
 {

-// ---          CurrIP              ---
-IS_CONTAINS_USER<CHG_CURRIP_NOTIFIER_PING> IsContainsUserCurrIP(u);
-IS_CONTAINS_USER<CHG_IPS_NOTIFIER_PING> IsContainsUserIP(u);
-
-std::list<CHG_CURRIP_NOTIFIER_PING>::iterator currIPter;
-std::list<CHG_IPS_NOTIFIER_PING>::iterator IPIter;
-
-currIPter = find_if(ChgCurrIPNotifierList.begin(),
-                    ChgCurrIPNotifierList.end(),
-                    IsContainsUserCurrIP);
-
-if (currIPter != ChgCurrIPNotifierList.end())
-    {
-    currIPter->GetUser()->DelCurrIPAfterNotifier(&(*currIPter));
-    ChgCurrIPNotifierList.erase(currIPter);
-    }
-// ---         CurrIP end          ---
-
-// ---          IP              ---
-IPIter = find_if(ChgIPNotifierList.begin(),
-                 ChgIPNotifierList.end(),
-                 IsContainsUserIP);
-
-if (IPIter != ChgIPNotifierList.end())
-    {
-    IPIter->GetUser()->GetProperty().ips.DelAfterNotifier(&(*IPIter));
-    ChgIPNotifierList.erase(IPIter);
-    }
-// ---          IP end          ---
+    m_conns.erase(std::remove_if(m_conns.begin(), m_conns.end(),
+                                 [u](const auto& c){ return std::get<0>(c) == u->GetID(); }),
+                  m_conns.end());

 }
 //-----------------------------------------------------------------------------
 void PING::GetUsers()
 {
 }
 //-----------------------------------------------------------------------------
 void PING::GetUsers()
 {

-STG_LOCKER lock(&mutex);
+std::lock_guard lock(m_mutex);

 
 

-USER_PTR u;
+UserPtr u;

 int h = users->OpenSearch();
 assert(h && "USERS::OpenSearch is always correct");
 
 int h = users->OpenSearch();
 assert(h && "USERS::OpenSearch is always correct");
 


@@ -278,38 +200,36 @@ while (users->SearchNext(h, &u) == 0)
     {
     usersList.push_back(u);
     SetUserNotifiers(u);
     {
     usersList.push_back(u);
     SetUserNotifiers(u);

-    if (u->GetProperty().ips.ConstData().OnlyOneIP())
+    if (u->GetProperties().ips.ConstData().onlyOneIP())

         {
         {

-        pinger.AddIP(u->GetProperty().ips.ConstData()[0].ip);
+        m_pinger.AddIP(u->GetProperties().ips.ConstData()[0].ip);

         }
     else
         {
         uint32_t ip = u->GetCurrIP();
         }
     else
         {
         uint32_t ip = u->GetCurrIP();

-        if (ip)
-            {
-            pinger.AddIP(ip);
-            }
+        if (ip != 0)
+            m_pinger.AddIP(ip);

         }
     }
 
 users->CloseSearch(h);
 }
 //-----------------------------------------------------------------------------
         }
     }
 
 users->CloseSearch(h);
 }
 //-----------------------------------------------------------------------------

-void PING::AddUser(USER_PTR u)
+void PING::AddUser(UserPtr u)

 {
 {

-STG_LOCKER lock(&mutex);
+std::lock_guard lock(m_mutex);

 
 SetUserNotifiers(u);
 usersList.push_back(u);
 }
 //-----------------------------------------------------------------------------
 
 SetUserNotifiers(u);
 usersList.push_back(u);
 }
 //-----------------------------------------------------------------------------

-void PING::DelUser(USER_PTR u)
+void PING::DelUser(UserPtr u)

 {
 {

-STG_LOCKER lock(&mutex);
+std::lock_guard lock(m_mutex);

 
 UnSetUserNotifiers(u);
 
 
 UnSetUserNotifiers(u);
 

-std::list<USER_PTR>::iterator users_iter;
+std::list<UserPtr>::iterator users_iter;

 users_iter = usersList.begin();
 
 while (users_iter != usersList.end())
 users_iter = usersList.begin();
 
 while (users_iter != usersList.end())


@@ -323,35 +243,18 @@ while (users_iter != usersList.end())
     }
 }
 //-----------------------------------------------------------------------------
     }
 }
 //-----------------------------------------------------------------------------

-void CHG_CURRIP_NOTIFIER_PING::Notify(const uint32_t & oldIP, const uint32_t & newIP)
+void PING::updateCurrIP(uint32_t oldVal, uint32_t newVal)

 {
 {

-ping.pinger.DelIP(oldIP);
-if (newIP)
-    {
-    ping.pinger.AddIP(newIP);
-    }
+    m_pinger.DelIP(oldVal);
+    if (newVal != 0)
+        m_pinger.AddIP(newVal);

 }
 //-----------------------------------------------------------------------------
 }
 //-----------------------------------------------------------------------------

-void CHG_IPS_NOTIFIER_PING::Notify(const USER_IPS & oldIPS, const USER_IPS & newIPS)
+void PING::updateIPs(const UserIPs& oldVal, const UserIPs& newVal)

 {
 {

-if (oldIPS.OnlyOneIP())
-    {
-    ping.pinger.DelIP(oldIPS[0].ip);
-    }
+    if (oldVal.onlyOneIP())
+        m_pinger.DelIP(oldVal[0].ip);

 
 

-if (newIPS.OnlyOneIP())
-    {
-    ping.pinger.AddIP(newIPS[0].ip);
-    }
+    if (newVal.onlyOneIP())
+        m_pinger.AddIP(newVal[0].ip);

 }
 }

-//-----------------------------------------------------------------------------
-void ADD_USER_NONIFIER_PING::Notify(const USER_PTR & user)
-{
-ping.AddUser(user);
-}
-//-----------------------------------------------------------------------------
-void DEL_USER_NONIFIER_PING::Notify(const USER_PTR & user)
-{
-ping.DelUser(user);
-}
-//-----------------------------------------------------------------------------