X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/89a688a2876a7922dc2824769b91cab8bba00c4b..a91e9542b384905187890f161d4da5396996fcfd:/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 c8240679..53f7b2f0 100644 --- a/projects/stargazer/plugins/other/ping/ping.cpp +++ b/projects/stargazer/plugins/other/ping/ping.cpp @@ -1,50 +1,50 @@ +#include "ping.h" + +#include "stg/user.h" +#include "stg/locker.h" +#include "stg/user_property.h" + #include #include #include #include #include -#include "stg/user.h" -#include "stg/locker.h" -#include "stg/user_property.h" -#include "stg/plugin_creator.h" -#include "ping.h" - -PLUGIN_CREATOR pc; -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -PLUGIN * GetPlugin() +namespace { -return pc.GetPlugin(); -} //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- -// ëÌÁÓÓ ÄÌÑ ÐÏÉÓËÁ ÀÚÅÒÁ × ÓÐÉÓËÅ ÎÏÔÉÆÉËÁÔÏÒÏ× template -class IS_CONTAINS_USER: public binary_function +class HAS_USER: public std::binary_function { 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; }; +} + +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::const_iterator pvi; +STG::ParamValue pv; +std::vector::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"); @@ -61,27 +61,16 @@ return 0; } //----------------------------------------------------------------------------- PING::PING() - : errorStr(), - pingSettings(), - settings(), - users(NULL), - usersList(), - thread(), - mutex(), - nonstop(false), + : users(NULL), isRunning(false), - pinger(), - ChgCurrIPNotifierList(), - ChgIPNotifierList(), onAddUserNotifier(*this), - onDelUserNotifier(*this) + onDelUserNotifier(*this), + logger(STG::PluginLogger::get("ping")) { -pthread_mutex_init(&mutex, NULL); } //----------------------------------------------------------------------------- PING::~PING() { -pthread_mutex_destroy(&mutex); } //----------------------------------------------------------------------------- int PING::ParseSettings() @@ -99,30 +88,23 @@ 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(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++) @@ -133,23 +115,10 @@ for (int i = 0; i < 25; i++) 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"); - } - users->DelNotifierUserAdd(&onAddUserNotifier); users->DelNotifierUserDel(&onDelUserNotifier); -list::iterator users_iter; +std::list::iterator users_iter; users_iter = usersList.begin(); while (users_iter != usersList.end()) { @@ -157,6 +126,11 @@ while (users_iter != usersList.end()) ++users_iter; } +if (isRunning) + m_thread.detach(); +else + m_thread.join(); + return 0; } //----------------------------------------------------------------------------- @@ -165,25 +139,28 @@ bool PING::IsRunning() 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, NULL); -long delay = (10000000 * ping->pingSettings.GetPingDelay()) / 3 + 50000000; - -while (ping->nonstop) +isRunning = true; + +long delay = (10000000 * pingSettings.GetPingDelay()) / 3 + 50000000; + +while (!token.stop_requested()) { - list::iterator iter = ping->usersList.begin(); + std::list::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()) { - 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) (*iter)->UpdatePingTime(t); @@ -195,7 +172,7 @@ while (ping->nonstop) if (ip) { time_t t; - if (ping->pinger.GetIPTime(ip, &t) == 0) + if (pinger.GetIPTime(ip, &t) == 0) { if (t) (*iter)->UpdatePingTime(t); @@ -208,18 +185,17 @@ while (ping->nonstop) struct timespec ts = {delay / 1000000000, delay % 1000000000}; for (int i = 0; i < 100; i++) { - if (ping->nonstop) + if (!token.stop_requested()) { nanosleep(&ts, NULL); } } } -ping->isRunning = false; -return NULL; +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); @@ -228,17 +204,17 @@ ChgCurrIPNotifierList.push_front(ChgCurrIPNotifier); 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 IsContainsUserCurrIP(u); -IS_CONTAINS_USER IsContainsUserIP(u); +HAS_USER IsContainsUserCurrIP(u); +HAS_USER IsContainsUserIP(u); -list::iterator currIPter; -list::iterator IPIter; +std::list::iterator currIPter; +std::list::iterator IPIter; currIPter = find_if(ChgCurrIPNotifierList.begin(), ChgCurrIPNotifierList.end(), @@ -258,7 +234,7 @@ IPIter = find_if(ChgIPNotifierList.begin(), if (IPIter != ChgIPNotifierList.end()) { - IPIter->GetUser()->GetProperty().ips.DelAfterNotifier(&(*IPIter)); + IPIter->GetUser()->GetProperties().ips.DelAfterNotifier(&(*IPIter)); ChgIPNotifierList.erase(IPIter); } // --- IP end --- @@ -266,9 +242,9 @@ if (IPIter != ChgIPNotifierList.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(); assert(h && "USERS::OpenSearch is always correct"); @@ -276,38 +252,36 @@ 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) - { 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::iterator users_iter; +std::list::iterator users_iter; users_iter = usersList.begin(); while (users_iter != usersList.end()) @@ -325,30 +299,24 @@ void CHG_CURRIP_NOTIFIER_PING::Notify(const uint32_t & oldIP, const uint32_t & n { ping.pinger.DelIP(oldIP); if (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); - } -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); }