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 53f7b2f02b8bdf929d540f98358347ac69ffa6e2..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;
     }
     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");


@@ -61,22 +61,16 @@ return 0;
 }
 //-----------------------------------------------------------------------------
 PING::PING()
 }
 //-----------------------------------------------------------------------------
 PING::PING()

-    : users(NULL),
+    : users(nullptr),

       isRunning(false),
       isRunning(false),

-      onAddUserNotifier(*this),
-      onDelUserNotifier(*this),

       logger(STG::PluginLogger::get("ping"))
 {
 }
 //-----------------------------------------------------------------------------
       logger(STG::PluginLogger::get("ping"))
 {
 }
 //-----------------------------------------------------------------------------

-PING::~PING()
-{
-}
-//-----------------------------------------------------------------------------

 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;
 }


@@ -85,13 +79,13 @@ 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); });

 
 pinger.SetDelayTime(pingSettings.GetPingDelay());
 pinger.Start();
 
 
 pinger.SetDelayTime(pingSettings.GetPingDelay());
 pinger.Start();
 

-m_thread = std::jthread([this](auto token){ Run(token); });
+m_thread = std::jthread([this](auto token){ Run(std::move(token)); });

 
 return 0;
 }
 
 return 0;
 }


@@ -112,11 +106,11 @@ 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<UserPtr>::iterator users_iter;
 users_iter = usersList.begin();
 
 std::list<UserPtr>::iterator users_iter;
 users_iter = usersList.begin();


@@ -143,7 +137,7 @@ 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;
 
 
 isRunning = true;
 


@@ -151,7 +145,7 @@ long delay = (10000000 * pingSettings.GetPingDelay()) / 3 + 50000000;
 
 while (!token.stop_requested())
     {
 
 while (!token.stop_requested())
     {

-    std::list<UserPtr>::iterator iter = usersList.begin();
+    auto iter = usersList.begin();

         {
         std::lock_guard lock(m_mutex);
         while (iter != usersList.end())
         {
         std::lock_guard lock(m_mutex);
         while (iter != usersList.end())


@@ -162,19 +156,19 @@ while (!token.stop_requested())
                 time_t t;
                 if (pinger.GetIPTime(ip, &t) == 0)
                     {
                 time_t t;
                 if (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;
                     if (pinger.GetIPTime(ip, &t) == 0)
                         {
                     {
                     time_t t;
                     if (pinger.GetIPTime(ip, &t) == 0)
                         {

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

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


@@ -187,7 +181,7 @@ while (!token.stop_requested())
         {
         if (!token.stop_requested())
             {
         {
         if (!token.stop_requested())
             {

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

             }
         }
     }
             }
         }
     }


@@ -259,7 +253,7 @@ while (users->SearchNext(h, &u) == 0)
     else
         {
         uint32_t ip = u->GetCurrIP();
     else
         {
         uint32_t ip = u->GetCurrIP();

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

             pinger.AddIP(ip);
         }
     }
             pinger.AddIP(ip);
         }
     }


@@ -295,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);
 {
 ping.pinger.DelIP(oldIP);

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

     ping.pinger.AddIP(newIP);
 }
 //-----------------------------------------------------------------------------
     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);
 {
 if (oldIPS.onlyOneIP())
     ping.pinger.DelIP(oldIPS[0].ip);


@@ -310,14 +304,3 @@ if (oldIPS.onlyOneIP())
 if (newIPS.onlyOneIP())
     ping.pinger.AddIP(newIPS[0].ip);
 }
 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);
-}
-//-----------------------------------------------------------------------------