X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/5deec545989d26a0e56f11fddf42bfc8ca5886da..324028b1d412ab7308d2be18be2b8e4e30310d27:/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 5f87a99f..f0868e12 100644 --- a/projects/stargazer/plugins/other/ping/ping.cpp +++ b/projects/stargazer/plugins/other/ping/ping.cpp @@ -1,38 +1,23 @@ -#include -#include - +#include +#include +#include #include #include #include "stg/user.h" -#include "stg/stg_locker.h" +#include "stg/locker.h" #include "stg/user_property.h" +#include "stg/plugin_creator.h" #include "ping.h" -class PING_CREATOR -{ -private: - PING * ping; - -public: - PING_CREATOR() - : ping(new PING()) - { - }; - ~PING_CREATOR() - { - delete ping; - }; - - PING * GetPlugin() - { - return ping; - }; -}; +PLUGIN_CREATOR pc; //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- -PING_CREATOR pc; +PLUGIN * GetPlugin() +{ +return pc.GetPlugin(); +} //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- @@ -52,18 +37,6 @@ private: //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- -PLUGIN * GetPlugin() -{ -return pc.GetPlugin(); -} -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -PING_SETTINGS::PING_SETTINGS() - : pingDelay(0) -{ -} -//----------------------------------------------------------------------------- int PING_SETTINGS::ParseSettings(const MODULE_SETTINGS & s) { PARAM_VALUE pv; @@ -87,25 +60,19 @@ 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), + : errorStr(), + pingSettings(), + settings(), + users(NULL), + usersList(), + thread(), + mutex(), nonstop(false), isRunning(false), + pinger(), + ChgCurrIPNotifierList(), + ChgIPNotifierList(), onAddUserNotifier(*this), onDelUserNotifier(*this) { @@ -117,16 +84,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 +92,6 @@ if (ret) return ret; } //----------------------------------------------------------------------------- -void PING::SetUsers(USERS * u) -{ -users = u; -} -//----------------------------------------------------------------------------- -const std::string & PING::GetStrError() const -{ -return errorStr; -} -//----------------------------------------------------------------------------- int PING::Start() { GetUsers(); @@ -186,19 +133,6 @@ 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); @@ -210,6 +144,9 @@ while (users_iter != usersList.end()) ++users_iter; } +if (isRunning) + return -1; + return 0; } //----------------------------------------------------------------------------- @@ -220,7 +157,11 @@ 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; @@ -272,16 +213,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); @@ -333,11 +264,7 @@ STG_LOCKER lock(&mutex, __FILE__, __LINE__); 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) {