-#include <stdio.h>
-#include <signal.h>
-
-#include <ctime>
-#include <algorithm>
+#include "ping.h"
#include "stg/user.h"
#include "stg/locker.h"
#include "stg/user_property.h"
-#include "stg/plugin_creator.h"
-#include "ping.h"
-PLUGIN_CREATOR<PING> pc;
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-PLUGIN * GetPlugin()
+#include <cstdio>
+#include <cassert>
+#include <csignal>
+#include <ctime>
+#include <algorithm>
+
+namespace
{
-return pc.GetPlugin();
-}
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-// ëÌÁÓÓ ÄÌÑ ÐÏÉÓËÁ ÀÚÅÒÁ × ÓÐÉÓËÅ ÎÏÔÉÆÉËÁÔÏÒÏ×
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:
- 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;
- };
+ }
private:
- const USER_PTR & user;
+ const UserPtr & user;
};
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-PING_SETTINGS::PING_SETTINGS()
- : pingDelay(0)
+}
+
+extern "C" STG::Plugin* GetPlugin()
{
+ static PING plugin;
+ return &plugin;
}
//-----------------------------------------------------------------------------
-int PING_SETTINGS::ParseSettings(const MODULE_SETTINGS & s)
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+int PING_SETTINGS::ParseSettings(const STG::ModuleSettings & 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);
-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;
}
-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");
}
//-----------------------------------------------------------------------------
PING::PING()
- : users(NULL),
- nonstop(false),
+ : users(nullptr),
isRunning(false),
onAddUserNotifier(*this),
- onDelUserNotifier(*this)
-{
-pthread_mutex_init(&mutex, NULL);
-}
-//-----------------------------------------------------------------------------
-PING::~PING()
-{
-pthread_mutex_destroy(&mutex);
-}
-//-----------------------------------------------------------------------------
-const std::string PING::GetVersion() const
-{
-return "Pinger v.1.01";
-}
-//-----------------------------------------------------------------------------
-void PING::SetSettings(const MODULE_SETTINGS & s)
+ onDelUserNotifier(*this),
+ logger(STG::PluginLogger::get("ping"))
{
-settings = s;
}
//-----------------------------------------------------------------------------
int PING::ParseSettings()
{
-int ret = pingSettings.ParseSettings(settings);
-if (ret)
+auto ret = pingSettings.ParseSettings(settings);
+if (ret != 0)
errorStr = pingSettings.GetStrError();
return ret;
}
//-----------------------------------------------------------------------------
-void PING::SetUsers(USERS * u)
-{
-users = u;
-}
-//-----------------------------------------------------------------------------
-const std::string & PING::GetStrError() const
-{
-return errorStr;
-}
-//-----------------------------------------------------------------------------
int PING::Start()
{
GetUsers();
users->AddNotifierUserAdd(&onAddUserNotifier);
users->AddNotifierUserDel(&onDelUserNotifier);
-nonstop = true;
-
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(std::move(token)); });
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();
-nonstop = false;
+m_thread.request_stop();
//5 seconds to thread stops itself
struct timespec ts = {0, 200000000};
for (int i = 0; i < 25; i++)
if (!isRunning)
break;
- nanosleep(&ts, NULL);
- }
-
-//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, nullptr);
}
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;
}
+if (isRunning)
+ m_thread.detach();
+else
+ m_thread.join();
+
return 0;
}
//-----------------------------------------------------------------------------
return isRunning;
}
//-----------------------------------------------------------------------------
-void * PING::Run(void * d)
+void PING::Run(std::stop_token token)
{
-PING * ping = (PING *)d;
-ping->isRunning = true;
+sigset_t signalSet;
+sigfillset(&signalSet);
+pthread_sigmask(SIG_BLOCK, &signalSet, nullptr);
+
+isRunning = true;
+
+long delay = (10000000 * pingSettings.GetPingDelay()) / 3 + 50000000;
-long delay = (10000000 * ping->pingSettings.GetPingDelay()) / 3 + 50000000;
-
-while (ping->nonstop)
+while (!token.stop_requested())
{
- list<USER_PTR>::iterator iter = ping->usersList.begin();
+ auto 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())
{
- uint32_t ip = (*iter)->GetProperty().ips.ConstData()[0].ip;
+ 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);
}
}
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;
}
//-----------------------------------------------------------------------------
-uint16_t PING::GetStartPosition() const
-{
-return 100;
-}
-//-----------------------------------------------------------------------------
-uint16_t PING::GetStopPosition() const
-{
-return 100;
-}
-//-----------------------------------------------------------------------------
-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);
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 ---
-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(),
if (IPIter != ChgIPNotifierList.end())
{
- IPIter->GetUser()->GetProperty().ips.DelAfterNotifier(&(*IPIter));
+ IPIter->GetUser()->GetProperties().ips.DelAfterNotifier(&(*IPIter));
ChgIPNotifierList.erase(IPIter);
}
// --- IP end ---
//-----------------------------------------------------------------------------
void PING::GetUsers()
{
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+std::lock_guard lock(m_mutex);
-USER_PTR u;
+UserPtr u;
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);
- 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)
- {
+ if (ip != 0)
pinger.AddIP(ip);
- }
}
}
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);
}
//-----------------------------------------------------------------------------
-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);
-list<USER_PTR>::iterator users_iter;
+std::list<UserPtr>::iterator users_iter;
users_iter = usersList.begin();
while (users_iter != usersList.end())
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 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);
- }
-if (newIPS.OnlyOneIP())
- {
+if (newIPS.onlyOneIP())
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);
}
//-----------------------------------------------------------------------------
-void DEL_USER_NONIFIER_PING::Notify(const USER_PTR & user)
+void DEL_USER_NONIFIER_PING::Notify(const UserPtr & user)
{
ping.DelUser(user);
}
git.stg.codes / stg.git / blobdiff