X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/a500fb72810060e52d87ad2c2e4691531f0bcc5a..2574a28cbf000603bc31f61593dbf061ff56c1d5:/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 a8dda2a6..892331f6 100644 --- a/projects/stargazer/plugins/other/ping/ping.cpp +++ b/projects/stargazer/plugins/other/ping/ping.cpp @@ -1,46 +1,34 @@ #include "ping.h" #include "stg/user.h" -#include "stg/locker.h" #include "stg/user_property.h" +#include #include #include #include #include -#include + +using STG::PING; +using STG::PING_SETTINGS; namespace { -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -template -class HAS_USER: public std::binary_function -{ -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::const_iterator pvi; +ParamValue pv; +std::vector::const_iterator pvi; pv.param = "PingDelay"; pvi = std::find(s.moduleParams.begin(), s.moduleParams.end(), pv); @@ -50,7 +38,7 @@ if (pvi == s.moduleParams.end() || pvi->value.empty()) 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"); @@ -61,22 +49,16 @@ return 0; } //----------------------------------------------------------------------------- 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; } @@ -85,13 +67,13 @@ int PING::Start() { 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_pinger.SetDelayTime(pingSettings.GetPingDelay()); +m_pinger.Start(); -m_thread = std::jthread([this](auto token){ Run(token); }); +m_thread = std::jthread([this](auto token){ Run(std::move(token)); }); return 0; } @@ -103,7 +85,7 @@ std::lock_guard lock(m_mutex); if (!m_thread.joinable()) return 0; -pinger.Stop(); +m_pinger.Stop(); m_thread.request_stop(); //5 seconds to thread stops itself struct timespec ts = {0, 200000000}; @@ -112,22 +94,18 @@ for (int i = 0; i < 25; i++) if (!isRunning) break; - nanosleep(&ts, NULL); + nanosleep(&ts, nullptr); } -users->DelNotifierUserAdd(&onAddUserNotifier); -users->DelNotifierUserDel(&onDelUserNotifier); +m_onAddUserConn.disconnect(); +m_onDelUserConn.disconnect(); -std::list::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; } @@ -141,7 +119,7 @@ void PING::Run(std::stop_token token) { sigset_t signalSet; sigfillset(&signalSet); -pthread_sigmask(SIG_BLOCK, &signalSet, NULL); +pthread_sigmask(SIG_BLOCK, &signalSet, nullptr); isRunning = true; @@ -149,7 +127,7 @@ long delay = (10000000 * pingSettings.GetPingDelay()) / 3 + 50000000; while (!token.stop_requested()) { - std::list::iterator iter = usersList.begin(); + auto iter = usersList.begin(); { std::lock_guard lock(m_mutex); while (iter != usersList.end()) @@ -158,21 +136,21 @@ while (!token.stop_requested()) { uint32_t ip = (*iter)->GetProperties().ips.ConstData()[0].ip; time_t t; - if (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(); - if (ip) + if (ip != 0) { time_t t; - if (pinger.GetIPTime(ip, &t) == 0) + if (m_pinger.GetIPTime(ip, t) == 0) { - if (t) + if (t != 0) (*iter)->UpdatePingTime(t); } } @@ -185,7 +163,7 @@ while (!token.stop_requested()) { if (!token.stop_requested()) { - nanosleep(&ts, NULL); + nanosleep(&ts, nullptr); } } } @@ -195,47 +173,18 @@ isRunning = false; //----------------------------------------------------------------------------- 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 IsContainsUserCurrIP(u); -HAS_USER IsContainsUserIP(u); - -std::list::iterator currIPter; -std::list::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() @@ -252,13 +201,13 @@ while (users->SearchNext(h, &u) == 0) SetUserNotifiers(u); if (u->GetProperties().ips.ConstData().onlyOneIP()) { - pinger.AddIP(u->GetProperties().ips.ConstData()[0].ip); + m_pinger.AddIP(u->GetProperties().ips.ConstData()[0].ip); } else { uint32_t ip = u->GetCurrIP(); - if (ip) - pinger.AddIP(ip); + if (ip != 0) + m_pinger.AddIP(ip); } } @@ -293,29 +242,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 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()) + m_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()) + m_pinger.AddIP(newVal[0].ip); } -//----------------------------------------------------------------------------- -void DEL_USER_NONIFIER_PING::Notify(const UserPtr & user) -{ -ping.DelUser(user); -} -//-----------------------------------------------------------------------------