X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/90e389f6ec12e60a62c362296ffcf314feb5b03d..9c340da9ffa670c20c3658a2be43d35868a9f5d9:/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 0fb5d30b..040e3faa 100644 --- a/projects/stargazer/plugins/other/ping/ping.cpp +++ b/projects/stargazer/plugins/other/ping/ping.cpp @@ -1,54 +1,38 @@ -#include -#include - -#include -#include +#include "ping.h" #include "stg/user.h" #include "stg/locker.h" #include "stg/user_property.h" -#include "ping.h" +#include "stg/plugin_creator.h" -class PING_CREATOR -{ -private: - PING * ping; +#include +#include +#include +#include +#include -public: - PING_CREATOR() - : ping(new PING()) - { - }; - ~PING_CREATOR() - { - delete ping; - }; +namespace +{ +PLUGIN_CREATOR pc; - PING * GetPlugin() - { - return ping; - }; -}; //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- -PING_CREATOR pc; -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -// ëÌÁÓÓ ÄÌÑ ÐÏÉÓËÁ ÀÚÅÒÁ × ÓÐÉÓËÅ ÎÏÔÉÆÉËÁÔÏÒÏ× 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 USER_PTR & u) : user(u) {} bool operator()(varType notifier) const { return notifier.GetUser() == user; - }; + } private: const USER_PTR & user; }; +} + +extern "C" PLUGIN * GetPlugin(); //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- @@ -59,19 +43,14 @@ return pc.GetPlugin(); //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- -PING_SETTINGS::PING_SETTINGS() - : pingDelay(0) -{ -} -//----------------------------------------------------------------------------- int PING_SETTINGS::ParseSettings(const MODULE_SETTINGS & s) { PARAM_VALUE pv; -vector::const_iterator pvi; +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 +66,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(GetPluginLogger(GetStgLogger(), "ping")) { pthread_mutex_init(&mutex, NULL); } @@ -117,16 +82,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 +90,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 +105,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 +115,7 @@ return 0; //----------------------------------------------------------------------------- int PING::Stop() { -STG_LOCKER lock(&mutex, __FILE__, __LINE__); +STG_LOCKER lock(&mutex); if (!isRunning) return 0; @@ -186,23 +132,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()) { @@ -210,6 +143,9 @@ while (users_iter != usersList.end()) ++users_iter; } +if (isRunning) + return -1; + return 0; } //----------------------------------------------------------------------------- @@ -220,16 +156,20 @@ 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; long delay = (10000000 * ping->pingSettings.GetPingDelay()) / 3 + 50000000; - + while (ping->nonstop) { - list::iterator 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()) @@ -272,16 +212,6 @@ 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) { CHG_CURRIP_NOTIFIER_PING ChgCurrIPNotifier(*this, u); @@ -297,11 +227,11 @@ u->GetProperty().ips.AddAfterNotifier(&(*ChgIPNotifierList.begin())); void PING::UnSetUserNotifiers(USER_PTR 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(), @@ -329,15 +259,11 @@ if (IPIter != ChgIPNotifierList.end()) //----------------------------------------------------------------------------- void PING::GetUsers() { -STG_LOCKER lock(&mutex, __FILE__, __LINE__); +STG_LOCKER lock(&mutex); USER_PTR 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) { @@ -351,9 +277,7 @@ while (users->SearchNext(h, &u) == 0) { uint32_t ip = u->GetCurrIP(); if (ip) - { pinger.AddIP(ip); - } } } @@ -362,7 +286,7 @@ users->CloseSearch(h); //----------------------------------------------------------------------------- void PING::AddUser(USER_PTR u) { -STG_LOCKER lock(&mutex, __FILE__, __LINE__); +STG_LOCKER lock(&mutex); SetUserNotifiers(u); usersList.push_back(u); @@ -370,11 +294,11 @@ usersList.push_back(u); //----------------------------------------------------------------------------- void PING::DelUser(USER_PTR 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()) @@ -392,22 +316,16 @@ 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) { if (oldIPS.OnlyOneIP()) - { ping.pinger.DelIP(oldIPS[0].ip); - } if (newIPS.OnlyOneIP()) - { ping.pinger.AddIP(newIPS[0].ip); - } } //----------------------------------------------------------------------------- void ADD_USER_NONIFIER_PING::Notify(const USER_PTR & user)