Extra semicolon and return in void functions removed

[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..ea71a117b7bb925c1e753d00cf3665d5aea1c962 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp
+++ b/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp
@@ -1,7 +1,6 @@
-#include <stdio.h>

 #include <unistd.h>
 #include <unistd.h>

-#include <signal.h>

 
 

+#include <csignal>

 #include <algorithm>
 
 #include "stg/tariffs.h"
 #include <algorithm>
 
 #include "stg/tariffs.h"


@@ -17,16 +16,6 @@ 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;
 int STG_CONFIG_SETTINGS::ParseSettings(const MODULE_SETTINGS & s)
 {
 int p;


@@ -52,11 +41,6 @@ port = p;
 return 0;
 }
 //-----------------------------------------------------------------------------
 return 0;
 }
 //-----------------------------------------------------------------------------

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

 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 PLUGIN * GetPlugin()
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 PLUGIN * GetPlugin()


@@ -72,46 +56,21 @@ 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),

+      config(),

       users(NULL),
       admins(NULL),
       tariffs(NULL),
       store(NULL),
       users(NULL),
       admins(NULL),
       tariffs(NULL),
       store(NULL),

+      settings(),

       stgSettings(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)
-{
-stgSettings = s;
-}
-//-----------------------------------------------------------------------------
-void STG_CONFIG::SetSettings(const MODULE_SETTINGS & s)
-{
-settings = s;
-}
-//-----------------------------------------------------------------------------

 int STG_CONFIG::ParseSettings()
 {
 int ret = stgConfigSettings.ParseSettings(settings);
 int STG_CONFIG::ParseSettings()
 {
 int ret = stgConfigSettings.ParseSettings(settings);


@@ -120,11 +79,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)


@@ -169,50 +123,28 @@ for (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)
 {

+sigset_t signalSet;
+sigfillset(&signalSet);
+pthread_sigmask(SIG_BLOCK, &signalSet, NULL);
+

 STG_CONFIG * stgConf = (STG_CONFIG *)d;
 stgConf->isRunning = true;
 
 STG_CONFIG * stgConf = (STG_CONFIG *)d;
 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;
-}
-//-----------------------------------------------------------------------------
-
-