X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/81087d4ae038fe0d793ee56e14120cd216ea3a7f..1cb912e4f90473f78d2f0f10ab5c9b2c5bd36440:/projects/stargazer/plugins/other/ping/ping.cpp?ds=sidebyside diff --git a/projects/stargazer/plugins/other/ping/ping.cpp b/projects/stargazer/plugins/other/ping/ping.cpp index 79d1f4f7..2cbd1f8b 100644 --- a/projects/stargazer/plugins/other/ping/ping.cpp +++ b/projects/stargazer/plugins/other/ping/ping.cpp @@ -1,79 +1,45 @@ -#include -#include -#include - #include "ping.h" -#include "../../../user.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 +#include +#include +#include +#include - PING * GetPlugin() - { - return ping; - }; -}; -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -PING_CREATOR pc; -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -// ëÌÁÓÓ ÄÌÑ ÐÏÉÓËÁ ÀÚÅÒÁ × ÓÐÉÓËÅ ÎÏÔÉÆÉËÁÔÏÒÏ× -template -class IS_CONTAINS_USER: public binary_function +using STG::PING; +using STG::PING_SETTINGS; + +namespace { -public: - IS_CONTAINS_USER(const user_iter & u) : user(u) {} - bool operator()(varType notifier) const - { - return notifier.GetUser() == user; - }; -private: - const user_iter & user; -}; -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -BASE_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 MODULE_SETTINGS & s) +int PING_SETTINGS::ParseSettings(const ModuleSettings & s) { -PARAM_VALUE pv; -vector::const_iterator pvi; +ParamValue pv; +std::vector::const_iterator pvi; pv.param = "PingDelay"; -pvi = find(s.moduleParams.begin(), s.moduleParams.end(), pv); -if (pvi == s.moduleParams.end()) +pvi = std::find(s.moduleParams.begin(), s.moduleParams.end(), pv); +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"); @@ -83,127 +49,64 @@ if (ParseIntInRange(pvi->value[0], 5, 3600, &pingDelay)) return 0; } //----------------------------------------------------------------------------- -int PING_SETTINGS::ParseIntInRange(const 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), - nonstop(false), + : users(nullptr), isRunning(false), - onAddUserNotifier(*this), - onDelUserNotifier(*this) -{ -pthread_mutex_init(&mutex, NULL); -} -//----------------------------------------------------------------------------- -PING::~PING() -{ -pthread_mutex_destroy(&mutex); -} -//----------------------------------------------------------------------------- -const string PING::GetVersion() const -{ -return "Pinger v.1.01"; -} -//----------------------------------------------------------------------------- -void PING::SetSettings(const MODULE_SETTINGS & s) + logger(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 string & PING::GetStrError() const -{ -return errorStr; -} -//----------------------------------------------------------------------------- int PING::Start() { GetUsers(); -users->AddNotifierUserAdd(&onAddUserNotifier); -users->AddNotifierUserDel(&onDelUserNotifier); - -nonstop = true; +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(); -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_pinger.Stop(); +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; - usleep(200000); + nanosleep(&ts, nullptr); } -//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"); - } +m_onAddUserConn.disconnect(); +m_onDelUserConn.disconnect(); -users->DelNotifierUserAdd(&onAddUserNotifier); -users->DelNotifierUserDel(&onDelUserNotifier); +m_conns.clear(); -list::iterator users_iter; -users_iter = usersList.begin(); -while (users_iter != usersList.end()) - { - UnSetUserNotifiers(*users_iter); - users_iter++; - } +if (isRunning) + m_thread.detach(); +else + m_thread.join(); return 0; } @@ -213,160 +116,120 @@ bool PING::IsRunning() return isRunning; } //----------------------------------------------------------------------------- -void * PING::Run(void * d) +void PING::Run(std::stop_token token) { -PING * ping = (PING*)d; -ping->isRunning = true; -list::iterator iter; -uint32_t ip; -time_t t; +sigset_t signalSet; +sigfillset(&signalSet); +pthread_sigmask(SIG_BLOCK, &signalSet, nullptr); + +isRunning = true; -while (ping->nonstop) +long delay = (10000000 * pingSettings.GetPingDelay()) / 3 + 50000000; + +while (!token.stop_requested()) { - 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)->property.ips.ConstData().OnlyOneIP()) + if ((*iter)->GetProperties().ips.ConstData().onlyOneIP()) { - ip = (*iter)->property.ips.ConstData()[0].ip; - if (ping->pinger.GetIPTime(ip, &t) == 0) + uint32_t ip = (*iter)->GetProperties().ips.ConstData()[0].ip; + time_t t; + if (m_pinger.GetIPTime(ip, t) == 0) { - if (t) + if (t != 0) (*iter)->UpdatePingTime(t); } } else { - ip = (*iter)->GetCurrIP(); - if (ip) + uint32_t ip = (*iter)->GetCurrIP(); + if (ip != 0) { - if (ping->pinger.GetIPTime(ip, &t) == 0) + time_t t; + if (m_pinger.GetIPTime(ip, t) == 0) { - if (t) + if (t != 0) (*iter)->UpdatePingTime(t); } } } - iter++; + ++iter; } } + struct timespec ts = {delay / 1000000000, delay % 1000000000}; for (int i = 0; i < 100; i++) { - if (ping->nonstop) + if (!token.stop_requested()) { - usleep((10000*ping->pingSettings.GetPingDelay())/3 + 50000); + nanosleep(&ts, nullptr); } } } -ping->isRunning = false; -return NULL; -} -//----------------------------------------------------------------------------- -uint16_t PING::GetStartPosition() const -{ -return 100; + +isRunning = false; } //----------------------------------------------------------------------------- -uint16_t PING::GetStopPosition() const +void PING::SetUserNotifiers(UserPtr u) { -return 100; + 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::SetUserNotifiers(user_iter u) +void PING::UnSetUserNotifiers(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->property.ips.AddAfterNotifier(&(*ChgIPNotifierList.begin())); -} -//----------------------------------------------------------------------------- -void PING::UnSetUserNotifiers(user_iter u) -{ -// --- CurrIP --- -IS_CONTAINS_USER IsContainsUserCurrIP(u); -IS_CONTAINS_USER IsContainsUserIP(u); - -list::iterator currIPter; -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()->property.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() { -STG_LOCKER lock(&mutex, __FILE__, __LINE__); +std::lock_guard lock(m_mutex); -user_iter 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->property.ips.ConstData().OnlyOneIP()) + if (u->GetProperties().ips.ConstData().onlyOneIP()) { - pinger.AddIP(u->property.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); } } users->CloseSearch(h); } //----------------------------------------------------------------------------- -void PING::AddUser(user_iter 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_iter u) +void PING::DelUser(UserPtr u) { -STG_LOCKER lock(&mutex, __FILE__, __LINE__); +std::lock_guard lock(m_mutex); UnSetUserNotifiers(u); -list::iterator users_iter; +std::list::iterator users_iter; users_iter = usersList.begin(); while (users_iter != usersList.end()) @@ -376,39 +239,22 @@ while (users_iter != usersList.end()) usersList.erase(users_iter); break; } - users_iter++; + ++users_iter; } } //----------------------------------------------------------------------------- -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 USER_IPS & oldIPS, const USER_IPS & 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 user_iter & user) -{ -ping.AddUser(user); -} -//----------------------------------------------------------------------------- -void DEL_USER_NONIFIER_PING::Notify(const user_iter & user) -{ -ping.DelUser(user); + if (newVal.onlyOneIP()) + m_pinger.AddIP(newVal[0].ip); } -//-----------------------------------------------------------------------------