Move strategy into job.

[stg.git] / projects / stargazer / plugins / configuration / sgconfig / stgconfig.cpp

diff --git a/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp b/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp
index 06e915c37e873e11461453f4a02f836405f4d74f..4666575c1ec4c7191903f86a1e621653173bd122 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp
+++ b/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp
@@ -1,237 +1,147 @@
-#include <stdio.h>
-#include <unistd.h>
-#include <signal.h>
+/*
+ *    This program is free software; you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation; either version 2 of the License, or
+ *    (at your option) any later version.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+/*
+ *    Author : Boris Mikhailenko <stg34@stargazer.dp.ua>
+ */

 
 

-#include <algorithm>
-
-#include "stg/tariffs.h"
-#include "stg/admins.h"
-#include "stg/users.h"

 #include "stgconfig.h"
 
 #include "stgconfig.h"
 

-class STGCONFIG_CREATOR
-{
-private:
-    STG_CONFIG * stgconfig;
+#include "stg/common.h"

 
 

-public:
-    STGCONFIG_CREATOR()
-        : stgconfig(new STG_CONFIG())
-        {
-        };
-    ~STGCONFIG_CREATOR()
-        {
-        delete stgconfig;
-        };
+#include <algorithm>
+#include <csignal>
+#include <cstring>
+#include <cerrno>

 
 

-    STG_CONFIG * GetPlugin()
-        {
-        return stgconfig;
-        };
-};
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-STGCONFIG_CREATOR stgc;
-//-----------------------------------------------------------------------------

 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------

-STG_CONFIG_SETTINGS::STG_CONFIG_SETTINGS()
-    : port(0)
-{
-}
-//-----------------------------------------------------------------------------
-const std::string & STG_CONFIG_SETTINGS::GetStrError() const
-{
-return errorStr;
-}

 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------

-int STG_CONFIG_SETTINGS::ParseSettings(const MODULE_SETTINGS & s)
+bool STG_CONFIG_SETTINGS::ParseSettings(const STG::ModuleSettings & s)

 {
 {

-int p;
-PARAM_VALUE pv;
-vector<PARAM_VALUE>::const_iterator pvi;
-///////////////////////////
-pv.param = "Port";
-pvi = std::find(s.moduleParams.begin(), s.moduleParams.end(), pv);
-if (pvi == s.moduleParams.end())
-    {
-    errorStr = "Parameter \'Port\' not found.";
-    printfd(__FILE__, "Parameter 'Port' not found\n");
-    return -1;
-    }
-if (ParseIntInRange(pvi->value[0], 2, 65535, &p))
-    {
-    errorStr = "Cannot parse parameter \'Port\': " + errorStr;
-    printfd(__FILE__, "%s\n", errorStr.c_str());
-    return -1;
-    }
-port = p;
+    STG::ParamValue pv;
+    std::vector<STG::ParamValue>::const_iterator pvi;
+    ///////////////////////////
+    pv.param = "Port";
+    pvi = std::find(s.moduleParams.begin(), s.moduleParams.end(), pv);
+    if (pvi == s.moduleParams.end() || pvi->value.empty())
+        {
+        errorStr = "Parameter \'Port\' is not found.";
+        printfd(__FILE__, "%s\n", errorStr.c_str());
+        return false;
+        }
+    int p;
+    if (ParseIntInRange(pvi->value[0], 2, 65535, &p))
+        {
+        errorStr = "Parameter \'Port\' should be an integral value in range (2, 65535). Actual value: '" + pvi->value[0] + "'.";
+        printfd(__FILE__, "%s\n", errorStr.c_str());
+        return false;
+        }
+    m_port = static_cast<uint16_t>(p);

 
 

-return 0;
-}
-//-----------------------------------------------------------------------------
-uint16_t STG_CONFIG_SETTINGS::GetPort() const
-{
-return port;
+    pv.param = "BindAddress";
+    pvi = std::find(s.moduleParams.begin(), s.moduleParams.end(), pv);
+    if (pvi != s.moduleParams.end() && !pvi->value.empty())
+        m_bindAddress = pvi->value[0];
+
+    return true;

 }
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 }
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------

-PLUGIN * GetPlugin()
+extern "C" STG::Plugin * GetPlugin()

 {
 {

-return stgc.GetPlugin();
+    static STG_CONFIG plugin;
+    return &plugin;

 }
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 }
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------

-const std::string STG_CONFIG::GetVersion() const
-{
-return "Stg configurator v.0.08";
-}
-//-----------------------------------------------------------------------------

 STG_CONFIG::STG_CONFIG()
     : nonstop(false),
       isRunning(false),
 STG_CONFIG::STG_CONFIG()
     : nonstop(false),
       isRunning(false),

-      users(NULL),
-      admins(NULL),
-      tariffs(NULL),
-      store(NULL),
-      stgSettings(NULL)
+      logger(STG::PluginLogger::get("conf_sg")),
+      config(logger)

 {
 }
 //-----------------------------------------------------------------------------
 {
 }
 //-----------------------------------------------------------------------------

-void STG_CONFIG::SetUsers(USERS * u)
-{
-users = u;
-}
-//-----------------------------------------------------------------------------
-void STG_CONFIG::SetTariffs(TARIFFS * t)
-{
-tariffs = t;
-}
-//-----------------------------------------------------------------------------
-void STG_CONFIG::SetAdmins(ADMINS * a)
-{
-admins = a;
-}
-//-----------------------------------------------------------------------------
-void STG_CONFIG::SetStore(STORE * s)
-{
-store = s;
-}
-//-----------------------------------------------------------------------------
-void STG_CONFIG::SetStgSettings(const SETTINGS * s)
-{
-stgSettings = s;
-}
-//-----------------------------------------------------------------------------
-void STG_CONFIG::SetSettings(const MODULE_SETTINGS & s)
-{
-settings = s;
-}
-//-----------------------------------------------------------------------------

 int STG_CONFIG::ParseSettings()
 {
 int STG_CONFIG::ParseSettings()
 {

-int ret = stgConfigSettings.ParseSettings(settings);
-if (ret)
+    if (stgConfigSettings.ParseSettings(settings))
+        return 0;

     errorStr = stgConfigSettings.GetStrError();
     errorStr = stgConfigSettings.GetStrError();

-return ret;
-}
-//-----------------------------------------------------------------------------
-const std::string & STG_CONFIG::GetStrError() const
-{
-return errorStr;
+    return -1;

 }
 //-----------------------------------------------------------------------------
 int STG_CONFIG::Start()
 {
 }
 //-----------------------------------------------------------------------------
 int STG_CONFIG::Start()
 {

-if (isRunning)
-    return 0;
+    if (isRunning)
+        return 0;

 
 

-nonstop = true;
+    nonstop = true;

 
 

-config.SetPort(stgConfigSettings.GetPort());
-config.SetAdmins(admins);
-config.SetUsers(users);
-config.SetTariffs(tariffs);
-config.SetStgSettings(stgSettings);
-config.SetStore(store);
+    config.SetPort(stgConfigSettings.GetPort());
+    config.SetBindAddress(stgConfigSettings.GetBindAddress());

 
 

-if (config.Prepare())
+    if (config.Prepare())

     {
     {

-    errorStr = config.GetStrError();
-    return -1;
+        errorStr = config.GetStrError();
+        return -1;

     }
 
     }
 

-if (pthread_create(&thread, NULL, Run, this))
-    {
-    errorStr = "Cannot create thread.";
-    printfd(__FILE__, "Cannot create thread\n");
-    return -1;
-    }
-errorStr = "";
-return 0;
+    m_thread = std::jthread([this](auto token){ Run(std::move(token)); });
+
+    return 0;

 }
 //-----------------------------------------------------------------------------
 int STG_CONFIG::Stop()
 {
 }
 //-----------------------------------------------------------------------------
 int STG_CONFIG::Stop()
 {

-if (!isRunning)
-    return 0;
+    if (!isRunning)
+        return 0;

 
 

-config.Stop();
+    config.Stop();
+    m_thread.request_stop();

 
 

-//5 seconds to thread stops itself
-int i;
-for (i = 0; i < 25; i++)
+    //5 seconds to thread stops itself
+    for (size_t i = 0; i < 25; ++i)

     {
     {

-    if (!isRunning)
-        break;
+        if (!isRunning)
+            break;

 
 

-    usleep(200000);
+        struct timespec ts = {0, 200000000};
+        nanosleep(&ts, NULL);

     }
 
     }
 

-//after 5 seconds waiting thread still running. now killing it
-if (isRunning)
-    {
-    //TODO pthread_cancel()
-    if (pthread_kill(thread, SIGINT))
-        {
-        errorStr = "Cannot kill thread.";
-        printfd(__FILE__, "Cannot kill thread\n");
-        return -1;
-        }
-    printfd(__FILE__, "STG_CONFIG killed\n");
-    }
+    if (isRunning)
+        m_thread.detach();
+    else
+        m_thread.join();

 
 

-return 0;
-}
-//-----------------------------------------------------------------------------
-bool STG_CONFIG::IsRunning()
-{
-return isRunning;
+    return 0;

 }
 //-----------------------------------------------------------------------------
 }
 //-----------------------------------------------------------------------------

-void * STG_CONFIG::Run(void * d)
+void STG_CONFIG::Run(std::stop_token token)

 {
 {

-STG_CONFIG * stgConf = (STG_CONFIG *)d;
-stgConf->isRunning = true;
+    sigset_t signalSet;
+    sigfillset(&signalSet);
+    pthread_sigmask(SIG_BLOCK, &signalSet, NULL);

 
 

-stgConf->config.Run(&stgConf->config);
-
-stgConf->isRunning = false;
-return NULL;
-}
-//-----------------------------------------------------------------------------
-uint16_t STG_CONFIG::GetStartPosition() const
-{
-return 220;
-}
-//-----------------------------------------------------------------------------
-uint16_t STG_CONFIG::GetStopPosition() const
-{
-return 220;
-}
-//-----------------------------------------------------------------------------
+    isRunning = true;

 
 

+    config.Run(token);

 
 

+    isRunning = false;
+}