#include "stg/locker.h"
#include "stg/user_property.h"
+#include <algorithm>
#include <cstdio>
#include <cassert>
#include <csignal>
#include <ctime>
-#include <algorithm>
+
+using STG::PING;
+using STG::PING_SETTINGS;
namespace
{
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-template <typename varType>
-class HAS_USER: public std::binary_function<varType, UserPtr, bool>
-{
-public:
- explicit HAS_USER(const UserPtr & u) : user(u) {}
- bool operator()(varType notifier) const
- {
- return notifier.GetUser() == user;
- }
-private:
- const UserPtr & user;
-};
-}
extern "C" STG::Plugin* GetPlugin()
{
static PING plugin;
return &plugin;
}
+
+}
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-int PING_SETTINGS::ParseSettings(const STG::ModuleSettings & s)
+int PING_SETTINGS::ParseSettings(const ModuleSettings & s)
{
-STG::ParamValue pv;
-std::vector<STG::ParamValue>::const_iterator pvi;
+ParamValue pv;
+std::vector<ParamValue>::const_iterator pvi;
pv.param = "PingDelay";
pvi = std::find(s.moduleParams.begin(), s.moduleParams.end(), pv);
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),
+ : users(nullptr),
isRunning(false),
- onAddUserNotifier(*this),
- onDelUserNotifier(*this),
- logger(STG::PluginLogger::get("ping"))
-{
-}
-//-----------------------------------------------------------------------------
-PING::~PING()
+ logger(PluginLogger::get("ping"))
{
}
//-----------------------------------------------------------------------------
int PING::ParseSettings()
{
-int ret = pingSettings.ParseSettings(settings);
-if (ret)
+auto ret = pingSettings.ParseSettings(settings);
+if (ret != 0)
errorStr = pingSettings.GetStrError();
return ret;
}
{
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();
-m_thread = std::jthread([this](auto token){ Run(token); });
+m_thread = std::jthread([this](auto token){ Run(std::move(token)); });
return 0;
}
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();
-while (users_iter != usersList.end())
- {
- UnSetUserNotifiers(*users_iter);
- ++users_iter;
- }
+m_conns.clear();
if (isRunning)
m_thread.detach();
+else
+ m_thread.join();
return 0;
}
{
sigset_t signalSet;
sigfillset(&signalSet);
-pthread_sigmask(SIG_BLOCK, &signalSet, NULL);
+pthread_sigmask(SIG_BLOCK, &signalSet, nullptr);
isRunning = true;
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())
time_t t;
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 (pinger.GetIPTime(ip, &t) == 0)
{
- if (t)
+ if (t != 0)
(*iter)->UpdatePingTime(t);
}
}
{
if (!token.stop_requested())
{
- nanosleep(&ts, NULL);
+ nanosleep(&ts, nullptr);
}
}
}
//-----------------------------------------------------------------------------
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->GetProperties().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(UserPtr u)
{
-// --- CurrIP ---
-HAS_USER<CHG_CURRIP_NOTIFIER_PING> IsContainsUserCurrIP(u);
-HAS_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()->GetProperties().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()
else
{
uint32_t ip = u->GetCurrIP();
- if (ip)
+ if (ip != 0)
pinger.AddIP(ip);
}
}
}
}
//-----------------------------------------------------------------------------
-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);
+ pinger.DelIP(oldVal);
+ if (newVal != 0)
+ pinger.AddIP(newVal);
}
//-----------------------------------------------------------------------------
-void CHG_IPS_NOTIFIER_PING::Notify(const STG::UserIPs & oldIPS, const STG::UserIPs & newIPS)
+void PING::updateIPs(const UserIPs& oldVal, const UserIPs& newVal)
{
-if (oldIPS.onlyOneIP())
- ping.pinger.DelIP(oldIPS[0].ip);
+ if (oldVal.onlyOneIP())
+ pinger.DelIP(oldVal[0].ip);
-if (newIPS.onlyOneIP())
- ping.pinger.AddIP(newIPS[0].ip);
-}
-//-----------------------------------------------------------------------------
-void ADD_USER_NONIFIER_PING::Notify(const UserPtr & user)
-{
-ping.AddUser(user);
+ if (newVal.onlyOneIP())
+ pinger.AddIP(newVal[0].ip);
}
-//-----------------------------------------------------------------------------
-void DEL_USER_NONIFIER_PING::Notify(const UserPtr & user)
-{
-ping.DelUser(user);
-}
-//-----------------------------------------------------------------------------
git.stg.codes / stg.git / blobdiff