X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/a6680ce3d763763a6010c81c8a5a8f7a1ce052db..bc6cac0e474dfe2feb4983aef98f99e23a98ffc4:/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 040e3faa..35237120 100644 --- a/projects/stargazer/plugins/other/ping/ping.cpp +++ b/projects/stargazer/plugins/other/ping/ping.cpp @@ -3,7 +3,6 @@ #include "stg/user.h" #include "stg/locker.h" #include "stg/user_property.h" -#include "stg/plugin_creator.h" #include #include @@ -13,40 +12,35 @@ namespace { -PLUGIN_CREATOR pc; - //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- template -class HAS_USER: public std::binary_function +class HAS_USER: public std::binary_function { public: - explicit HAS_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" PLUGIN * GetPlugin(); -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -PLUGIN * GetPlugin() +extern "C" STG::Plugin* GetPlugin() { -return pc.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; -std::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); @@ -56,7 +50,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"); @@ -67,25 +61,18 @@ return 0; } //----------------------------------------------------------------------------- PING::PING() - : users(NULL), - nonstop(false), + : users(nullptr), isRunning(false), onAddUserNotifier(*this), onDelUserNotifier(*this), - logger(GetPluginLogger(GetStgLogger(), "ping")) -{ -pthread_mutex_init(&mutex, NULL); -} -//----------------------------------------------------------------------------- -PING::~PING() + logger(STG::PluginLogger::get("ping")) { -pthread_mutex_destroy(&mutex); } //----------------------------------------------------------------------------- int PING::ParseSettings() { -int ret = pingSettings.ParseSettings(settings); -if (ret) +auto ret = pingSettings.ParseSettings(settings); +if (ret != 0) errorStr = pingSettings.GetStrError(); return ret; } @@ -97,31 +84,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."; - logger("Cannot create 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); +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++) @@ -129,13 +108,13 @@ for (int i = 0; i < 25; i++) if (!isRunning) break; - nanosleep(&ts, NULL); + nanosleep(&ts, nullptr); } users->DelNotifierUserAdd(&onAddUserNotifier); users->DelNotifierUserDel(&onDelUserNotifier); -std::list::iterator users_iter; +std::list::iterator users_iter; users_iter = usersList.begin(); while (users_iter != usersList.end()) { @@ -144,7 +123,9 @@ while (users_iter != usersList.end()) } if (isRunning) - return -1; + m_thread.detach(); +else + m_thread.join(); return 0; } @@ -154,43 +135,42 @@ bool PING::IsRunning() return isRunning; } //----------------------------------------------------------------------------- -void * PING::Run(void * d) +void PING::Run(std::stop_token token) { sigset_t signalSet; sigfillset(&signalSet); -pthread_sigmask(SIG_BLOCK, &signalSet, NULL); +pthread_sigmask(SIG_BLOCK, &signalSet, nullptr); -PING * ping = static_cast(d); -ping->isRunning = true; +isRunning = true; -long delay = (10000000 * ping->pingSettings.GetPingDelay()) / 3 + 50000000; +long delay = (10000000 * pingSettings.GetPingDelay()) / 3 + 50000000; -while (ping->nonstop) +while (!token.stop_requested()) { - std::list::iterator iter = ping->usersList.begin(); + auto iter = usersList.begin(); { - STG_LOCKER lock(&ping->mutex); - 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); } } @@ -201,18 +181,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); + nanosleep(&ts, nullptr); } } } -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); @@ -221,10 +200,10 @@ 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 --- HAS_USER IsContainsUserCurrIP(u); @@ -251,7 +230,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 --- @@ -259,9 +238,9 @@ if (IPIter != ChgIPNotifierList.end()) //----------------------------------------------------------------------------- void PING::GetUsers() { -STG_LOCKER lock(&mutex); +std::lock_guard lock(m_mutex); -USER_PTR u; +UserPtr u; int h = users->OpenSearch(); assert(h && "USERS::OpenSearch is always correct"); @@ -269,14 +248,14 @@ 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); } } @@ -284,21 +263,21 @@ while (users->SearchNext(h, &u) == 0) users->CloseSearch(h); } //----------------------------------------------------------------------------- -void PING::AddUser(USER_PTR u) +void PING::AddUser(UserPtr u) { -STG_LOCKER lock(&mutex); +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); +std::lock_guard lock(m_mutex); UnSetUserNotifiers(u); -std::list::iterator users_iter; +std::list::iterator users_iter; users_iter = usersList.begin(); while (users_iter != usersList.end()) @@ -312,28 +291,28 @@ while (users_iter != usersList.end()) } } //----------------------------------------------------------------------------- -void CHG_CURRIP_NOTIFIER_PING::Notify(const uint32_t & oldIP, const uint32_t & newIP) +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); }