COmpose CXXFLAGS for tests correctly.

[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 600f7d8092e4b260d71a18e5e4093a1a3a0d81db..88ccfd851e72a48af802317e4f6d3e370668d5e0 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp
+++ b/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp
@@ -1,37 +1,45 @@
-#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 "stgconfig.h"

 
 

-#include "stg/tariffs.h"
-#include "stg/admins.h"
-#include "stg/users.h"

 #include "stg/plugin_creator.h"
 #include "stg/plugin_creator.h"

-#include "stgconfig.h"
+#include "stg/common.h"
+
+#include <algorithm>
+#include <csignal>
+
+#include <unistd.h>

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

-PLUGIN_CREATOR<STG_CONFIG> stgc;
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
+static PLUGIN_CREATOR<STG_CONFIG> 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)
 {
 int p;
 PARAM_VALUE pv;
 //-----------------------------------------------------------------------------
 int STG_CONFIG_SETTINGS::ParseSettings(const MODULE_SETTINGS & s)
 {
 int p;
 PARAM_VALUE pv;

-vector<PARAM_VALUE>::const_iterator pvi;
+std::vector<PARAM_VALUE>::const_iterator pvi;

 ///////////////////////////
 pv.param = "Port";
 pvi = std::find(s.moduleParams.begin(), s.moduleParams.end(), pv);
 ///////////////////////////
 pv.param = "Port";
 pvi = std::find(s.moduleParams.begin(), s.moduleParams.end(), pv);


@@ -47,69 +55,30 @@ if (ParseIntInRange(pvi->value[0], 2, 65535, &p))
     printfd(__FILE__, "%s\n", errorStr.c_str());
     return -1;
     }
     printfd(__FILE__, "%s\n", errorStr.c_str());
     return -1;
     }

-port = p;
+port = static_cast<uint16_t>(p);

 
 return 0;
 }
 //-----------------------------------------------------------------------------
 
 return 0;
 }
 //-----------------------------------------------------------------------------

-uint16_t STG_CONFIG_SETTINGS::GetPort() const
-{
-return port;
-}

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

-//-----------------------------------------------------------------------------
-PLUGIN * GetPlugin()
+extern "C" PLUGIN * GetPlugin()

 {
 return stgc.GetPlugin();
 }
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 {
 return stgc.GetPlugin();
 }
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------

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

 STG_CONFIG::STG_CONFIG()
 STG_CONFIG::STG_CONFIG()

-    : nonstop(false),
+    : errorStr(),
+      stgConfigSettings(),
+      thread(),
+      nonstop(false),

       isRunning(false),
       isRunning(false),

-      users(NULL),
-      admins(NULL),
-      tariffs(NULL),
-      store(NULL),
-      stgSettings(NULL)
-{
-}
-//-----------------------------------------------------------------------------
-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)
+      logger(GetPluginLogger(GetStgLogger(), "conf_sg")),
+      config(logger),
+      settings()

 {
 {

-stgSettings = s;
-}
-//-----------------------------------------------------------------------------
-void STG_CONFIG::SetSettings(const MODULE_SETTINGS & s)
-{
-settings = s;

 }
 //-----------------------------------------------------------------------------
 int STG_CONFIG::ParseSettings()
 }
 //-----------------------------------------------------------------------------
 int STG_CONFIG::ParseSettings()


@@ -120,11 +89,6 @@ if (ret)
 return ret;
 }
 //-----------------------------------------------------------------------------
 return ret;
 }
 //-----------------------------------------------------------------------------

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

 int STG_CONFIG::Start()
 {
 if (isRunning)
 int STG_CONFIG::Start()
 {
 if (isRunning)


@@ -133,11 +97,6 @@ if (isRunning)
 nonstop = true;
 
 config.SetPort(stgConfigSettings.GetPort());
 nonstop = true;
 
 config.SetPort(stgConfigSettings.GetPort());

-config.SetAdmins(admins);
-config.SetUsers(users);
-config.SetTariffs(tariffs);
-config.SetStgSettings(stgSettings);
-config.SetStore(store);

 
 if (config.Prepare())
     {
 
 if (config.Prepare())
     {


@@ -149,6 +108,7 @@ if (pthread_create(&thread, NULL, Run, this))
     {
     errorStr = "Cannot create thread.";
     printfd(__FILE__, "Cannot create thread\n");
     {
     errorStr = "Cannot create thread.";
     printfd(__FILE__, "Cannot create thread\n");

+    logger("Cannot create thread.");

     return -1;
     }
 errorStr = "";
     return -1;
     }
 errorStr = "";


@@ -163,56 +123,33 @@ if (!isRunning)
 config.Stop();
 
 //5 seconds to thread stops itself
 config.Stop();
 
 //5 seconds to thread stops itself

-int i;
-for (i = 0; i < 25; i++)
+for (int 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)
 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");
-    }
+    return -1;

 
 return 0;
 }
 //-----------------------------------------------------------------------------
 
 return 0;
 }
 //-----------------------------------------------------------------------------

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

 void * STG_CONFIG::Run(void * d)
 {
 void * STG_CONFIG::Run(void * d)
 {

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

 stgConf->isRunning = true;
 
 stgConf->isRunning = true;
 

-stgConf->config.Run(&stgConf->config);
+stgConf->config.Run();

 
 stgConf->isRunning = false;
 return NULL;
 }
 //-----------------------------------------------------------------------------
 
 stgConf->isRunning = false;
 return NULL;
 }
 //-----------------------------------------------------------------------------

-uint16_t STG_CONFIG::GetStartPosition() const
-{
-return 220;
-}
-//-----------------------------------------------------------------------------
-uint16_t STG_CONFIG::GetStopPosition() const
-{
-return 220;
-}
-//-----------------------------------------------------------------------------
-
-