X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/12aae76fbeaa3dc91ab5ecad5531a2c1925340d2..8272f5d139d947fdbe469dfd7afc3ddd6ea7a603:/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 6a04c6fe..147ef68c 100644 --- a/projects/stargazer/plugins/other/ping/ping.cpp +++ b/projects/stargazer/plugins/other/ping/ping.cpp @@ -1,77 +1,50 @@ -#include -#include -#include - -#include - #include "ping.h" -#include "user.h" -#include "stg_locker.h" -#include "user_property.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; +namespace +{ //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- -// ëÌÁÓÓ ÄÌÑ ÐÏÉÓËÁ ÀÚÅÒÁ × ÓÐÉÓËÅ ÎÏÔÉÆÉËÁÔÏÒÏ× 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; }; -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -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 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"); @@ -87,27 +60,13 @@ if (ParseIntInRange(pvi->value[0], 5, 3600, &pingDelay)) return 0; } //----------------------------------------------------------------------------- -int PING_SETTINGS::ParseIntInRange(const std::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), isRunning(false), onAddUserNotifier(*this), - onDelUserNotifier(*this) + onDelUserNotifier(*this), + logger(STG::PluginLogger::get("ping")) { pthread_mutex_init(&mutex, NULL); } @@ -117,16 +76,6 @@ PING::~PING() pthread_mutex_destroy(&mutex); } //----------------------------------------------------------------------------- -const std::string PING::GetVersion() const -{ -return "Pinger v.1.01"; -} -//----------------------------------------------------------------------------- -void PING::SetSettings(const MODULE_SETTINGS & s) -{ -settings = s; -} -//----------------------------------------------------------------------------- int PING::ParseSettings() { int ret = pingSettings.ParseSettings(settings); @@ -135,16 +84,6 @@ if (ret) return ret; } //----------------------------------------------------------------------------- -void PING::SetUsers(USERS * u) -{ -users = u; -} -//----------------------------------------------------------------------------- -const std::string & PING::GetStrError() const -{ -return errorStr; -} -//----------------------------------------------------------------------------- int PING::Start() { GetUsers(); @@ -160,6 +99,7 @@ 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; } @@ -169,7 +109,7 @@ return 0; //----------------------------------------------------------------------------- int PING::Stop() { -STG_LOCKER lock(&mutex, __FILE__, __LINE__); +STG_LOCKER lock(&mutex); if (!isRunning) return 0; @@ -177,31 +117,19 @@ if (!isRunning) pinger.Stop(); nonstop = false; //5 seconds to thread stops itself +struct timespec ts = {0, 200000000}; for (int i = 0; i < 25; i++) { if (!isRunning) break; - usleep(200000); - } - -//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"); + nanosleep(&ts, NULL); } users->DelNotifierUserAdd(&onAddUserNotifier); users->DelNotifierUserDel(&onDelUserNotifier); -list::iterator users_iter; +std::list::iterator users_iter; users_iter = usersList.begin(); while (users_iter != usersList.end()) { @@ -209,6 +137,9 @@ while (users_iter != usersList.end()) ++users_iter; } +if (isRunning) + return -1; + return 0; } //----------------------------------------------------------------------------- @@ -219,22 +150,26 @@ return isRunning; //----------------------------------------------------------------------------- void * PING::Run(void * d) { -PING * ping = (PING*)d; +sigset_t signalSet; +sigfillset(&signalSet); +pthread_sigmask(SIG_BLOCK, &signalSet, NULL); + +PING * ping = static_cast(d); ping->isRunning = true; -list::iterator iter; -uint32_t ip; -time_t t; + +long delay = (10000000 * ping->pingSettings.GetPingDelay()) / 3 + 50000000; while (ping->nonstop) { - iter = ping->usersList.begin(); + std::list::iterator iter = ping->usersList.begin(); { - STG_LOCKER lock(&ping->mutex, __FILE__, __LINE__); + STG_LOCKER lock(&ping->mutex); while (iter != ping->usersList.end()) { - if ((*iter)->GetProperty().ips.ConstData().OnlyOneIP()) + if ((*iter)->GetProperties().ips.ConstData().onlyOneIP()) { - 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 (t) @@ -243,9 +178,10 @@ while (ping->nonstop) } else { - ip = (*iter)->GetCurrIP(); + uint32_t ip = (*iter)->GetCurrIP(); if (ip) { + time_t t; if (ping->pinger.GetIPTime(ip, &t) == 0) { if (t) @@ -256,29 +192,21 @@ while (ping->nonstop) ++iter; } } + struct timespec ts = {delay / 1000000000, delay % 1000000000}; for (int i = 0; i < 100; i++) { if (ping->nonstop) { - usleep((10000*ping->pingSettings.GetPingDelay())/3 + 50000); + nanosleep(&ts, NULL); } } } + ping->isRunning = false; return NULL; } //----------------------------------------------------------------------------- -uint16_t PING::GetStartPosition() const -{ -return 100; -} -//----------------------------------------------------------------------------- -uint16_t PING::GetStopPosition() const -{ -return 100; -} -//----------------------------------------------------------------------------- -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); @@ -287,17 +215,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(), @@ -317,7 +245,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 --- @@ -325,52 +253,46 @@ if (IPIter != ChgIPNotifierList.end()) //----------------------------------------------------------------------------- void PING::GetUsers() { -STG_LOCKER lock(&mutex, __FILE__, __LINE__); +STG_LOCKER lock(&mutex); -USER_PTR 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->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__); +STG_LOCKER lock(&mutex); SetUserNotifiers(u); usersList.push_back(u); } //----------------------------------------------------------------------------- -void PING::DelUser(USER_PTR u) +void PING::DelUser(UserPtr u) { -STG_LOCKER lock(&mutex, __FILE__, __LINE__); +STG_LOCKER lock(&mutex); UnSetUserNotifiers(u); -list::iterator users_iter; +std::list::iterator users_iter; users_iter = usersList.begin(); while (users_iter != usersList.end()) @@ -388,30 +310,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); }