]> git.stg.codes - stg.git/blobdiff - projects/stargazer/plugins/other/ping/ping.cpp
Use std::jthread and C++17.
[stg.git] / projects / stargazer / plugins / other / ping / ping.cpp
index 6a04c6fe9c2eff8ca8d93b387d8ed14ca73ee159..a8dda2a680ee510474c9e7169d86a9659119feb5 100644 (file)
@@ -1,77 +1,50 @@
-#include <stdio.h>
-#include <unistd.h>
-#include <signal.h>
-
-#include <algorithm>
-
 #include "ping.h"
 #include "ping.h"
-#include "user.h"
-#include "stg_locker.h"
-#include "user_property.h"
 
 
-class PING_CREATOR
-{
-private:
-    PING * ping;
+#include "stg/user.h"
+#include "stg/locker.h"
+#include "stg/user_property.h"
 
 
-public:
-    PING_CREATOR()
-        : ping(new PING())
-        {
-        };
-    ~PING_CREATOR()
-        {
-        delete ping;
-        };
+#include <cstdio>
+#include <cassert>
+#include <csignal>
+#include <ctime>
+#include <algorithm>
 
 
-    PING * GetPlugin()
-        {
-        return ping;
-        };
-};
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-PING_CREATOR pc;
+namespace
+{
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
-// ëÌÁÓÓ ÄÌÑ ÐÏÉÓËÁ ÀÚÅÒÁ × ÓÐÉÓËÅ ÎÏÔÉÆÉËÁÔÏÒÏ×
 template <typename varType>
 template <typename varType>
-class IS_CONTAINS_USER: public binary_function<varType, USER_PTR, bool>
+class HAS_USER: public std::binary_function<varType, UserPtr, bool>
 {
 public:
 {
 public:
-    IS_CONTAINS_USER(const USER_PTR & u) : user(u) {}
+    explicit HAS_USER(const UserPtr & u) : user(u) {}
     bool operator()(varType notifier) const
         {
         return notifier.GetUser() == user;
     bool operator()(varType notifier) const
         {
         return notifier.GetUser() == user;
-        };
+        }
 private:
 private:
-    const USER_PTR & user;
+    const UserPtr & user;
 };
 };
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-PLUGIN * GetPlugin()
+}
+
+extern "C" STG::Plugin* GetPlugin()
 {
 {
-return pc.GetPlugin();
+    static PING plugin;
+    return &plugin;
 }
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 }
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
-PING_SETTINGS::PING_SETTINGS()
-    : pingDelay(0)
+int PING_SETTINGS::ParseSettings(const STG::ModuleSettings & s)
 {
 {
-}
-//-----------------------------------------------------------------------------
-int PING_SETTINGS::ParseSettings(const MODULE_SETTINGS & s)
-{
-PARAM_VALUE pv;
-vector<PARAM_VALUE>::const_iterator pvi;
+STG::ParamValue pv;
+std::vector<STG::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");
     {
     errorStr = "Parameter \'PingDelay\' not found.";
     printfd(__FILE__, "Parameter 'PingDelay' not found\n");
@@ -87,44 +60,17 @@ if (ParseIntInRange(pvi->value[0], 5, 3600, &pingDelay))
 return 0;
 }
 //-----------------------------------------------------------------------------
 return 0;
 }
 //-----------------------------------------------------------------------------
-int PING_SETTINGS::ParseIntInRange(const std::string & str, int min, int max, int * val)
-{
-if (str2x(str.c_str(), *val))
-    {
-    errorStr = "Incorrect value \'" + str + "\'.";
-    return -1;
-    }
-if (*val < min || *val > max)
-    {
-    errorStr = "Value \'" + str + "\' out of range.";
-    return -1;
-    }
-return 0;
-}
-//-----------------------------------------------------------------------------
 PING::PING()
     : users(NULL),
 PING::PING()
     : users(NULL),
-      nonstop(false),
       isRunning(false),
       onAddUserNotifier(*this),
       isRunning(false),
       onAddUserNotifier(*this),
-      onDelUserNotifier(*this)
+      onDelUserNotifier(*this),
+      logger(STG::PluginLogger::get("ping"))
 {
 {
-pthread_mutex_init(&mutex, NULL);
 }
 //-----------------------------------------------------------------------------
 PING::~PING()
 {
 }
 //-----------------------------------------------------------------------------
 PING::~PING()
 {
-pthread_mutex_destroy(&mutex);
-}
-//-----------------------------------------------------------------------------
-const std::string PING::GetVersion() const
-{
-return "Pinger v.1.01";
-}
-//-----------------------------------------------------------------------------
-void PING::SetSettings(const MODULE_SETTINGS & s)
-{
-settings = s;
 }
 //-----------------------------------------------------------------------------
 int PING::ParseSettings()
 }
 //-----------------------------------------------------------------------------
 int PING::ParseSettings()
@@ -135,16 +81,6 @@ if (ret)
 return ret;
 }
 //-----------------------------------------------------------------------------
 return ret;
 }
 //-----------------------------------------------------------------------------
-void PING::SetUsers(USERS * u)
-{
-users = u;
-}
-//-----------------------------------------------------------------------------
-const std::string & PING::GetStrError() const
-{
-return errorStr;
-}
-//-----------------------------------------------------------------------------
 int PING::Start()
 {
 GetUsers();
 int PING::Start()
 {
 GetUsers();
@@ -152,56 +88,37 @@ GetUsers();
 users->AddNotifierUserAdd(&onAddUserNotifier);
 users->AddNotifierUserDel(&onDelUserNotifier);
 
 users->AddNotifierUserAdd(&onAddUserNotifier);
 users->AddNotifierUserDel(&onDelUserNotifier);
 
-nonstop = true;
-
 pinger.SetDelayTime(pingSettings.GetPingDelay());
 pinger.Start();
 
 pinger.SetDelayTime(pingSettings.GetPingDelay());
 pinger.Start();
 
-if (pthread_create(&thread, NULL, Run, this))
-    {
-    errorStr = "Cannot start thread.";
-    printfd(__FILE__, "Cannot start thread\n");
-    return -1;
-    }
+m_thread = std::jthread([this](auto token){ Run(token); });
 
 return 0;
 }
 //-----------------------------------------------------------------------------
 int PING::Stop()
 {
 
 return 0;
 }
 //-----------------------------------------------------------------------------
 int PING::Stop()
 {
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+std::lock_guard lock(m_mutex);
 
 
-if (!isRunning)
+if (!m_thread.joinable())
     return 0;
 
 pinger.Stop();
     return 0;
 
 pinger.Stop();
-nonstop = false;
+m_thread.request_stop();
 //5 seconds to thread stops itself
 //5 seconds to thread stops itself
+struct timespec ts = {0, 200000000};
 for (int i = 0; i < 25; i++)
     {
     if (!isRunning)
         break;
 
 for (int i = 0; i < 25; i++)
     {
     if (!isRunning)
         break;
 
-    usleep(200000);
-    }
-
-//after 5 seconds waiting thread still running. now kill it
-if (isRunning)
-    {
-    printfd(__FILE__, "kill PING thread.\n");
-    if (pthread_kill(thread, SIGINT))
-        {
-        errorStr = "Cannot kill PING thread.";
-        printfd(__FILE__, "Cannot kill PING thread.\n");
-        return -1;
-        }
-    printfd(__FILE__, "PING killed\n");
+    nanosleep(&ts, NULL);
     }
 
 users->DelNotifierUserAdd(&onAddUserNotifier);
 users->DelNotifierUserDel(&onDelUserNotifier);
 
     }
 
 users->DelNotifierUserAdd(&onAddUserNotifier);
 users->DelNotifierUserDel(&onDelUserNotifier);
 
-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())
     {
@@ -209,6 +126,9 @@ while (users_iter != usersList.end())
     ++users_iter;
     }
 
     ++users_iter;
     }
 
+if (isRunning)
+    m_thread.detach();
+
 return 0;
 }
 //-----------------------------------------------------------------------------
 return 0;
 }
 //-----------------------------------------------------------------------------
@@ -217,25 +137,28 @@ bool PING::IsRunning()
 return isRunning;
 }
 //-----------------------------------------------------------------------------
 return isRunning;
 }
 //-----------------------------------------------------------------------------
-void * PING::Run(void * d)
+void PING::Run(std::stop_token token)
 {
 {
-PING * ping = (PING*)d;
-ping->isRunning = true;
-list<USER_PTR>::iterator iter;
-uint32_t ip;
-time_t t;
+sigset_t signalSet;
+sigfillset(&signalSet);
+pthread_sigmask(SIG_BLOCK, &signalSet, NULL);
 
 
-while (ping->nonstop)
+isRunning = true;
+
+long delay = (10000000 * pingSettings.GetPingDelay()) / 3 + 50000000;
+
+while (!token.stop_requested())
     {
     {
-    iter = ping->usersList.begin();
+    std::list<UserPtr>::iterator iter = usersList.begin();
         {
         {
-        STG_LOCKER lock(&ping->mutex, __FILE__, __LINE__);
-        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())
                 {
                 {
-                ip = (*iter)->GetProperty().ips.ConstData()[0].ip;
-                if (ping->pinger.GetIPTime(ip, &t) == 0)
+                uint32_t ip = (*iter)->GetProperties().ips.ConstData()[0].ip;
+                time_t t;
+                if (pinger.GetIPTime(ip, &t) == 0)
                     {
                     if (t)
                         (*iter)->UpdatePingTime(t);
                     {
                     if (t)
                         (*iter)->UpdatePingTime(t);
@@ -243,10 +166,11 @@ while (ping->nonstop)
                 }
             else
                 {
                 }
             else
                 {
-                ip = (*iter)->GetCurrIP();
+                uint32_t ip = (*iter)->GetCurrIP();
                 if (ip)
                     {
                 if (ip)
                     {
-                    if (ping->pinger.GetIPTime(ip, &t) == 0)
+                    time_t t;
+                    if (pinger.GetIPTime(ip, &t) == 0)
                         {
                         if (t)
                             (*iter)->UpdatePingTime(t);
                         {
                         if (t)
                             (*iter)->UpdatePingTime(t);
@@ -256,29 +180,20 @@ while (ping->nonstop)
             ++iter;
             }
         }
             ++iter;
             }
         }
+    struct timespec ts = {delay / 1000000000, delay % 1000000000};
     for (int i = 0; i < 100; i++)
         {
     for (int i = 0; i < 100; i++)
         {
-        if (ping->nonstop)
+        if (!token.stop_requested())
             {
             {
-            usleep((10000*ping->pingSettings.GetPingDelay())/3 + 50000);
+            nanosleep(&ts, NULL);
             }
         }
     }
             }
         }
     }
-ping->isRunning = false;
-return NULL;
-}
-//-----------------------------------------------------------------------------
-uint16_t PING::GetStartPosition() const
-{
-return 100;
-}
-//-----------------------------------------------------------------------------
-uint16_t PING::GetStopPosition() const
-{
-return 100;
+
+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);
 {
 CHG_CURRIP_NOTIFIER_PING ChgCurrIPNotifier(*this, u);
 CHG_IPS_NOTIFIER_PING ChgIPNotifier(*this, u);
@@ -287,17 +202,17 @@ ChgCurrIPNotifierList.push_front(ChgCurrIPNotifier);
 ChgIPNotifierList.push_front(ChgIPNotifier);
 
 u->AddCurrIPAfterNotifier(&(*ChgCurrIPNotifierList.begin()));
 ChgIPNotifierList.push_front(ChgIPNotifier);
 
 u->AddCurrIPAfterNotifier(&(*ChgCurrIPNotifierList.begin()));
-u->GetProperty().ips.AddAfterNotifier(&(*ChgIPNotifierList.begin()));
+u->GetProperties().ips.AddAfterNotifier(&(*ChgIPNotifierList.begin()));
 }
 //-----------------------------------------------------------------------------
 }
 //-----------------------------------------------------------------------------
-void PING::UnSetUserNotifiers(USER_PTR u)
+void PING::UnSetUserNotifiers(UserPtr u)
 {
 // ---          CurrIP              ---
 {
 // ---          CurrIP              ---
-IS_CONTAINS_USER<CHG_CURRIP_NOTIFIER_PING> IsContainsUserCurrIP(u);
-IS_CONTAINS_USER<CHG_IPS_NOTIFIER_PING> IsContainsUserIP(u);
+HAS_USER<CHG_CURRIP_NOTIFIER_PING> IsContainsUserCurrIP(u);
+HAS_USER<CHG_IPS_NOTIFIER_PING> IsContainsUserIP(u);
 
 
-list<CHG_CURRIP_NOTIFIER_PING>::iterator currIPter;
-list<CHG_IPS_NOTIFIER_PING>::iterator IPIter;
+std::list<CHG_CURRIP_NOTIFIER_PING>::iterator currIPter;
+std::list<CHG_IPS_NOTIFIER_PING>::iterator IPIter;
 
 currIPter = find_if(ChgCurrIPNotifierList.begin(),
                     ChgCurrIPNotifierList.end(),
 
 currIPter = find_if(ChgCurrIPNotifierList.begin(),
                     ChgCurrIPNotifierList.end(),
@@ -317,7 +232,7 @@ IPIter = find_if(ChgIPNotifierList.begin(),
 
 if (IPIter != ChgIPNotifierList.end())
     {
 
 if (IPIter != ChgIPNotifierList.end())
     {
-    IPIter->GetUser()->GetProperty().ips.DelAfterNotifier(&(*IPIter));
+    IPIter->GetUser()->GetProperties().ips.DelAfterNotifier(&(*IPIter));
     ChgIPNotifierList.erase(IPIter);
     }
 // ---          IP end          ---
     ChgIPNotifierList.erase(IPIter);
     }
 // ---          IP end          ---
@@ -325,52 +240,46 @@ if (IPIter != ChgIPNotifierList.end())
 //-----------------------------------------------------------------------------
 void PING::GetUsers()
 {
 //-----------------------------------------------------------------------------
 void PING::GetUsers()
 {
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+std::lock_guard lock(m_mutex);
 
 
-USER_PTR u;
+UserPtr u;
 int h = users->OpenSearch();
 int h = users->OpenSearch();
-if (!h)
-    {
-    printfd(__FILE__, "users->OpenSearch() error\n");
-    return;
-    }
+assert(h && "USERS::OpenSearch is always correct");
 
 while (users->SearchNext(h, &u) == 0)
     {
     usersList.push_back(u);
     SetUserNotifiers(u);
 
 while (users->SearchNext(h, &u) == 0)
     {
     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);
+        pinger.AddIP(u->GetProperties().ips.ConstData()[0].ip);
         }
     else
         {
         uint32_t ip = u->GetCurrIP();
         if (ip)
         }
     else
         {
         uint32_t ip = u->GetCurrIP();
         if (ip)
-            {
             pinger.AddIP(ip);
             pinger.AddIP(ip);
-            }
         }
     }
 
 users->CloseSearch(h);
 }
 //-----------------------------------------------------------------------------
         }
     }
 
 users->CloseSearch(h);
 }
 //-----------------------------------------------------------------------------
-void PING::AddUser(USER_PTR u)
+void PING::AddUser(UserPtr u)
 {
 {
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+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, __FILE__, __LINE__);
+std::lock_guard lock(m_mutex);
 
 UnSetUserNotifiers(u);
 
 
 UnSetUserNotifiers(u);
 
-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())
@@ -388,30 +297,24 @@ void CHG_CURRIP_NOTIFIER_PING::Notify(const uint32_t & oldIP, const uint32_t & n
 {
 ping.pinger.DelIP(oldIP);
 if (newIP)
 {
 ping.pinger.DelIP(oldIP);
 if (newIP)
-    {
     ping.pinger.AddIP(newIP);
     ping.pinger.AddIP(newIP);
-    }
 }
 //-----------------------------------------------------------------------------
 }
 //-----------------------------------------------------------------------------
-void CHG_IPS_NOTIFIER_PING::Notify(const USER_IPS & oldIPS, const USER_IPS & newIPS)
+void CHG_IPS_NOTIFIER_PING::Notify(const STG::UserIPs & oldIPS, const STG::UserIPs & newIPS)
 {
 {
-if (oldIPS.OnlyOneIP())
-    {
+if (oldIPS.onlyOneIP())
     ping.pinger.DelIP(oldIPS[0].ip);
     ping.pinger.DelIP(oldIPS[0].ip);
-    }
 
 
-if (newIPS.OnlyOneIP())
-    {
+if (newIPS.onlyOneIP())
     ping.pinger.AddIP(newIPS[0].ip);
     ping.pinger.AddIP(newIPS[0].ip);
-    }
 }
 //-----------------------------------------------------------------------------
 }
 //-----------------------------------------------------------------------------
-void ADD_USER_NONIFIER_PING::Notify(const USER_PTR & user)
+void ADD_USER_NONIFIER_PING::Notify(const UserPtr & user)
 {
 ping.AddUser(user);
 }
 //-----------------------------------------------------------------------------
 {
 ping.AddUser(user);
 }
 //-----------------------------------------------------------------------------
-void DEL_USER_NONIFIER_PING::Notify(const USER_PTR & user)
+void DEL_USER_NONIFIER_PING::Notify(const UserPtr & user)
 {
 ping.DelUser(user);
 }
 {
 ping.DelUser(user);
 }