X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/8569ecdc2c9368dc0fe650b901cce7b37337ffec..80aca6d78d4ff5d514216fe96c44e2ee75c4e933:/projects/stargazer/plugins/other/smux/smux.cpp?ds=inline diff --git a/projects/stargazer/plugins/other/smux/smux.cpp b/projects/stargazer/plugins/other/smux/smux.cpp index 09cb4636..f79085df 100644 --- a/projects/stargazer/plugins/other/smux/smux.cpp +++ b/projects/stargazer/plugins/other/smux/smux.cpp @@ -15,17 +15,12 @@ #include #include "stg/common.h" -#include "stg/plugin_creator.h" #include "smux.h" #include "utils.h" namespace { -PLUGIN_CREATOR smc; - -bool SPrefixLess(const Sensors::value_type & a, - const Sensors::value_type & b); bool SPrefixLess(const Sensors::value_type & a, const Sensors::value_type & b) @@ -35,35 +30,31 @@ return a.first.PrefixLess(b.first); } -extern "C" PLUGIN * GetPlugin(); - -PLUGIN * GetPlugin() +extern "C" STG::Plugin* GetPlugin() { -return smc.GetPlugin(); + static SMUX plugin; + return &plugin; } SMUX_SETTINGS::SMUX_SETTINGS() - : errorStr(), - ip(0), - port(0), - password() + : ip(0), + port(0) {} -int SMUX_SETTINGS::ParseSettings(const MODULE_SETTINGS & s) +int SMUX_SETTINGS::ParseSettings(const STG::ModuleSettings & s) { -PARAM_VALUE pv; -std::vector::const_iterator pvi; +STG::ParamValue pv; int p; pv.param = "Port"; -pvi = std::find(s.moduleParams.begin(), s.moduleParams.end(), pv); -if (pvi == s.moduleParams.end()) +auto pvi = std::find(s.moduleParams.begin(), s.moduleParams.end(), pv); +if (pvi == s.moduleParams.end() || pvi->value.empty()) { errorStr = "Parameter \'Port\' not found."; printfd(__FILE__, "Parameter 'Port' not found\n"); return -1; } -if (ParseIntInRange(pvi->value[0], 2, 65535, &p)) +if (ParseIntInRange(pvi->value[0], 2, 65535, &p) != 0) { errorStr = "Cannot parse parameter \'Port\': " + errorStr; printfd(__FILE__, "Cannot parse parameter 'Port'\n"); @@ -73,7 +64,7 @@ port = static_cast(p); pv.param = "Password"; 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 \'Password\' not found."; printfd(__FILE__, "Parameter 'Password' not found\n"); @@ -86,7 +77,7 @@ else pv.param = "Server"; 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 \'Server\' not found."; printfd(__FILE__, "Parameter 'Server' not found\n"); @@ -98,36 +89,22 @@ return 0; } SMUX::SMUX() - : PLUGIN(), - users(NULL), - tariffs(NULL), - admins(NULL), - services(NULL), - corporations(NULL), - traffcounter(NULL), - errorStr(), - smuxSettings(), - settings(), - thread(), - mutex(), - running(false), + : users(nullptr), + tariffs(nullptr), + admins(nullptr), + services(nullptr), + corporations(nullptr), + traffcounter(nullptr), stopped(true), needReconnect(false), lastReconnectTry(0), reconnectTimeout(1), sock(-1), - smuxHandlers(), - pdusHandlers(), - sensors(), - tables(), - notifiers(), addUserNotifier(*this), delUserNotifier(*this), addDelTariffNotifier(*this), - logger(GetPluginLogger(GetStgLogger(), "smux")) + logger(STG::PluginLogger::get("smux")) { -pthread_mutex_init(&mutex, NULL); - smuxHandlers[SMUX_PDUs_PR_close] = &SMUX::CloseHandler; smuxHandlers[SMUX_PDUs_PR_registerResponse] = &SMUX::RegisterResponseHandler; smuxHandlers[SMUX_PDUs_PR_pdus] = &SMUX::PDUsRequestHandler; @@ -140,18 +117,11 @@ pdusHandlers[PDUs_PR_set_request] = &SMUX::SetRequestHandler; SMUX::~SMUX() { - { - Sensors::iterator it; - for (it = sensors.begin(); it != sensors.end(); ++it) - delete it->second; - } - { - Tables::iterator it; - for (it = tables.begin(); it != tables.end(); ++it) - delete it->second; - } -printfd(__FILE__, "SMUX::~SMUX()\n"); -pthread_mutex_destroy(&mutex); + for (auto& kv : sensors) + delete kv.second; + for (auto& kv : tables) + delete kv.second; + printfd(__FILE__, "SMUX::~SMUX()\n"); } int SMUX::ParseSettings() @@ -161,12 +131,12 @@ return smuxSettings.ParseSettings(settings); int SMUX::Start() { -assert(users != NULL && "users must not be NULL"); -assert(tariffs != NULL && "tariffs must not be NULL"); -assert(admins != NULL && "admins must not be NULL"); -assert(services != NULL && "services must not be NULL"); -assert(corporations != NULL && "corporations must not be NULL"); -assert(traffcounter != NULL && "traffcounter must not be NULL"); +assert(users != nullptr && "users must not be NULL"); +assert(tariffs != nullptr && "tariffs must not be NULL"); +assert(admins != nullptr && "admins must not be NULL"); +assert(services != nullptr && "services must not be NULL"); +assert(corporations != nullptr && "corporations must not be NULL"); +assert(traffcounter != nullptr && "traffcounter must not be NULL"); if (PrepareNet()) needReconnect = true; @@ -202,7 +172,7 @@ UpdateTables(); SetNotifiers(); #ifdef SMUX_DEBUG -Sensors::const_iterator it(sensors.begin()); +auto it = sensors.begin(); while (it != sensors.end()) { printfd(__FILE__, "%s = %s\n", @@ -212,16 +182,8 @@ while (it != sensors.end()) } #endif -if (!running) - { - if (pthread_create(&thread, NULL, Runner, this)) - { - errorStr = "Cannot create thread."; - logger("Cannot create thread."); - printfd(__FILE__, "Cannot create thread\n"); - return -1; - } - } +if (!m_thread.joinable()) + m_thread = std::jthread([this](auto token){ Run(std::move(token)); }); return 0; } @@ -229,7 +191,7 @@ return 0; int SMUX::Stop() { printfd(__FILE__, "SMUX::Stop() - Before\n"); -running = false; +m_thread.request_stop(); if (!stopped) { @@ -237,25 +199,21 @@ if (!stopped) for (int i = 0; i < 25 && !stopped; i++) { struct timespec ts = {0, 200000000}; - nanosleep(&ts, NULL); + nanosleep(&ts, nullptr); } } -if (stopped) - pthread_join(thread, NULL); +if (!stopped) + m_thread.detach(); +else + m_thread.join(); ResetNotifiers(); - { - Tables::iterator it; - for (it = tables.begin(); it != tables.end(); ++it) - delete it->second; - } - { - Sensors::iterator it; - for (it = sensors.begin(); it != sensors.end(); ++it) - delete it->second; - } +for (auto& kv : sensors) + delete kv.second; +for (auto& kv : tables) + delete kv.second; tables.erase(tables.begin(), tables.end()); sensors.erase(sensors.begin(), sensors.end()); @@ -264,7 +222,6 @@ close(sock); if (!stopped) { - running = true; return -1; } @@ -272,11 +229,11 @@ printfd(__FILE__, "SMUX::Stop() - After\n"); return 0; } -int SMUX::Reload() +int SMUX::Reload(const STG::ModuleSettings & /*ms*/) { -if (Stop()) +if (Stop() != 0) return -1; -if (Start()) +if (Start() != 0) return -1; if (!needReconnect) { @@ -286,45 +243,31 @@ if (!needReconnect) return 0; } -void * SMUX::Runner(void * d) -{ -sigset_t signalSet; -sigfillset(&signalSet); -pthread_sigmask(SIG_BLOCK, &signalSet, NULL); - -SMUX * smux = static_cast(d); - -smux->Run(); - -return NULL; -} - -void SMUX::Run() +void SMUX::Run(std::stop_token token) { stopped = true; if (!SendOpenPDU(sock)) needReconnect = true; if (!SendRReqPDU(sock)) needReconnect = true; -running = true; stopped = false; -while(running) +while (!token.stop_requested()) { if (WaitPackets(sock) && !needReconnect) { - SMUX_PDUs_t * pdus = RecvSMUXPDUs(sock); - if (pdus) + auto* pdus = RecvSMUXPDUs(sock); + if (pdus != nullptr) { DispatchPDUs(pdus); ASN_STRUCT_FREE(asn_DEF_SMUX_PDUs, pdus); } - else if (running) + else if (!token.stop_requested()) Reconnect(); } - else if (running && needReconnect) + else if (!token.stop_requested() && needReconnect) Reconnect(); - if (!running) + if (token.stop_requested()) break; } SendClosePDU(sock); @@ -349,7 +292,7 @@ addr.sin_family = AF_INET; addr.sin_port = htons(smuxSettings.GetPort()); addr.sin_addr.s_addr = smuxSettings.GetIP(); -if (connect(sock, reinterpret_cast(&addr), sizeof(addr))) +if (connect(sock, reinterpret_cast(&addr), sizeof(addr)) != 0) { errorStr = "Cannot connect."; logger("Cannot connect the socket: %s", strerror(errno)); @@ -362,7 +305,7 @@ return false; bool SMUX::Reconnect() { -if (needReconnect && difftime(time(NULL), lastReconnectTry) < reconnectTimeout) +if (needReconnect && difftime(time(nullptr), lastReconnectTry) < reconnectTimeout) return true; time(&lastReconnectTry); @@ -389,11 +332,9 @@ return true; bool SMUX::DispatchPDUs(const SMUX_PDUs_t * pdus) { -SMUXHandlers::iterator it(smuxHandlers.find(pdus->present)); +auto it = smuxHandlers.find(pdus->present); if (it != smuxHandlers.end()) - { return (this->*(it->second))(pdus); - } #ifdef SMUX_DEBUG else { @@ -421,7 +362,7 @@ bool SMUX::UpdateTables() { Sensors newSensors; bool done = true; -Tables::iterator it(tables.begin()); +auto it = tables.begin(); while (it != tables.end()) { try @@ -440,11 +381,11 @@ while (it != tables.end()) } if (!done) { - Sensors::iterator it(newSensors.begin()); - while (it != newSensors.end()) + auto sit = newSensors.begin(); + while (sit != newSensors.end()) { - delete it->second; - ++it; + delete sit->second; + ++sit; } return false; } @@ -452,12 +393,11 @@ if (!done) it = tables.begin(); while (it != tables.end()) { - std::pair res; - res = std::equal_range(sensors.begin(), - sensors.end(), - std::pair(OID(it->first), NULL), - SPrefixLess); - Sensors::iterator sit(res.first); + auto res = std::equal_range(sensors.begin(), + sensors.end(), + std::pair(OID(it->first), nullptr), + SPrefixLess); + auto sit = res.first; while (sit != res.second) { delete sit->second; @@ -472,20 +412,20 @@ sensors.insert(newSensors.begin(), newSensors.end()); return true; } -void SMUX::SetNotifier(USER_PTR userPtr) +void SMUX::SetNotifier(UserPtr userPtr) { -notifiers.push_back(CHG_AFTER_NOTIFIER(*this, userPtr)); -userPtr->GetProperty().tariffName.AddAfterNotifier(¬ifiers.back()); +notifiers.emplace_back(*this, userPtr); +userPtr->GetProperties().tariffName.AddAfterNotifier(¬ifiers.back()); } -void SMUX::UnsetNotifier(USER_PTR userPtr) +void SMUX::UnsetNotifier(UserPtr userPtr) { -std::list::iterator it = notifiers.begin(); +auto it = notifiers.begin(); while (it != notifiers.end()) { if (it->GetUserPtr() == userPtr) { - userPtr->GetProperty().tariffName.DelAfterNotifier(&(*it)); + userPtr->GetProperties().tariffName.DelAfterNotifier(&(*it)); notifiers.erase(it); break; } @@ -498,8 +438,8 @@ void SMUX::SetNotifiers() int h = users->OpenSearch(); assert(h && "USERS::OpenSearch is always correct"); -USER_PTR u; -while (!users->SearchNext(h, &u)) +UserPtr u; +while (users->SearchNext(h, &u) == 0) SetNotifier(u); users->CloseSearch(h); @@ -519,10 +459,10 @@ tariffs->DelNotifierAdd(&addDelTariffNotifier); users->DelNotifierUserDel(&delUserNotifier); users->DelNotifierUserAdd(&addUserNotifier); -std::list::iterator it(notifiers.begin()); +auto it = notifiers.begin(); while (it != notifiers.end()) { - it->GetUserPtr()->GetProperty().tariffName.DelAfterNotifier(&(*it)); + it->GetUserPtr()->GetProperties().tariffName.DelAfterNotifier(&(*it)); ++it; } notifiers.clear();