Fixed bfstream test compilation.

[stg.git] / projects / stargazer / main.cpp

diff --git a/projects/stargazer/main.cpp b/projects/stargazer/main.cpp
index 4fff88a16de7c82a094ca54ba2c3f094c2223bf6..200fd2a664e15f46e1d2228b20ba6f4db509bdd3 100644 (file)
--- a/projects/stargazer/main.cpp
+++ b/projects/stargazer/main.cpp
@@ -60,8 +60,6 @@
 #include "pidfile.h"
 #include "eventloop.h"
 
 #include "pidfile.h"
 #include "eventloop.h"
 

-using namespace std;
-

 #ifdef DEBUG
     #define MAIN_DEBUG (1)
     #define NO_DAEMON  (1)
 #ifdef DEBUG
     #define MAIN_DEBUG (1)
     #define NO_DAEMON  (1)


@@ -69,7 +67,16 @@ using namespace std;
 
 #define START_FILE "/._ST_ART_ED_"
 
 
 #define START_FILE "/._ST_ART_ED_"
 

-set<pid_t> executersPid;
+namespace
+{
+std::set<pid_t> executersPid;
+
+bool StartModCmp(const PLUGIN_RUNNER & lhs, const PLUGIN_RUNNER & rhs);
+bool StopModCmp(const PLUGIN_RUNNER & lhs, const PLUGIN_RUNNER & rhs);
+void StartTimer();
+int StartScriptExecuter(char * procName, int msgKey, int * msgID, SETTINGS_IMPL * settings);
+int ForkAndWait(const std::string & confDir);
+void KillExecuters();

 
 //-----------------------------------------------------------------------------
 bool StartModCmp(const PLUGIN_RUNNER & lhs, const PLUGIN_RUNNER & rhs)
 
 //-----------------------------------------------------------------------------
 bool StartModCmp(const PLUGIN_RUNNER & lhs, const PLUGIN_RUNNER & rhs)


@@ -82,7 +89,7 @@ bool StopModCmp(const PLUGIN_RUNNER & lhs, const PLUGIN_RUNNER & rhs)
 return lhs.GetStopPosition() > rhs.GetStopPosition();
 }
 //-----------------------------------------------------------------------------
 return lhs.GetStopPosition() > rhs.GetStopPosition();
 }
 //-----------------------------------------------------------------------------

-static void StartTimer()
+void StartTimer()

 {
 STG_LOGGER & WriteServLog = GetStgLogger();
 
 {
 STG_LOGGER & WriteServLog = GetStgLogger();
 


@@ -99,7 +106,7 @@ else
     }
 }
 //-----------------------------------------------------------------------------
     }
 }
 //-----------------------------------------------------------------------------

-#ifdef LINUX
+#if defined(LINUX) || defined(DARWIN)

 int StartScriptExecuter(char * procName, int msgKey, int * msgID, SETTINGS_IMPL * settings)
 #else
 int StartScriptExecuter(char *, int msgKey, int * msgID, SETTINGS_IMPL * settings)
 int StartScriptExecuter(char * procName, int msgKey, int * msgID, SETTINGS_IMPL * settings)
 #else
 int StartScriptExecuter(char *, int msgKey, int * msgID, SETTINGS_IMPL * settings)


@@ -144,7 +151,7 @@ switch (executerPid)
 
     case 0:
         delete settings;
 
     case 0:
         delete settings;

-#ifdef LINUX
+#if defined(LINUX) || defined(DARWIN)

         Executer(*msgID, executerPid, procName);
 #else
         Executer(*msgID, executerPid);
         Executer(*msgID, executerPid, procName);
 #else
         Executer(*msgID, executerPid);


@@ -153,7 +160,7 @@ switch (executerPid)
 
     default:
         if (executersPid.empty()) {
 
     default:
         if (executersPid.empty()) {

-#ifdef LINUX
+#if defined(LINUX) || defined(DARWIN)

             Executer(*msgID, executerPid, NULL);
 #else
             Executer(*msgID, executerPid);
             Executer(*msgID, executerPid, NULL);
 #else
             Executer(*msgID, executerPid);


@@ -165,14 +172,14 @@ return 0;
 }
 //-----------------------------------------------------------------------------
 #ifndef NO_DAEMON
 }
 //-----------------------------------------------------------------------------
 #ifndef NO_DAEMON

-int ForkAndWait(const string & confDir)
+int ForkAndWait(const std::string & confDir)

 #else
 #else

-int ForkAndWait(const string &)
+int ForkAndWait(const std::string &)

 #endif
 {
 #ifndef NO_DAEMON
 pid_t childPid = fork();
 #endif
 {
 #ifndef NO_DAEMON
 pid_t childPid = fork();

-string startFile = confDir + START_FILE;
+std::string startFile = confDir + START_FILE;

 unlink(startFile.c_str());
 
 switch (childPid)
 unlink(startFile.c_str());
 
 switch (childPid)


@@ -209,7 +216,7 @@ return 0;
 //-----------------------------------------------------------------------------
 void KillExecuters()
 {
 //-----------------------------------------------------------------------------
 void KillExecuters()
 {

-set<pid_t>::iterator pid;
+std::set<pid_t>::iterator pid;

 pid = executersPid.begin();
 while (pid != executersPid.end())
     {
 pid = executersPid.begin();
 while (pid != executersPid.end())
     {


@@ -219,6 +226,8 @@ while (pid != executersPid.end())
     }
 }
 //-----------------------------------------------------------------------------
     }
 }
 //-----------------------------------------------------------------------------

+} // namespace anonymous
+//-----------------------------------------------------------------------------

 int main(int argc, char * argv[])
 {
 SETTINGS_IMPL * settings = NULL;
 int main(int argc, char * argv[])
 {
 SETTINGS_IMPL * settings = NULL;


@@ -236,10 +245,10 @@ int msgID = -11;
     WriteServLog.SetLogFileName("/var/log/stargazer.log");
     }
 
     WriteServLog.SetLogFileName("/var/log/stargazer.log");
     }
 

-vector<MODULE_SETTINGS> modSettings;
-list<PLUGIN_RUNNER> modules;
+std::vector<MODULE_SETTINGS> modSettings;
+std::list<PLUGIN_RUNNER> modules;

 
 

-list<PLUGIN_RUNNER>::iterator modIter;
+std::list<PLUGIN_RUNNER>::iterator modIter;

 
 if (getuid())
     {
 
 if (getuid())
     {


@@ -264,7 +273,7 @@ if (settings->ReadSettings())
     }
 
 #ifndef NO_DAEMON
     }
 
 #ifndef NO_DAEMON

-string startFile(settings->GetConfDir() + START_FILE);
+std::string startFile(settings->GetConfDir() + START_FILE);

 #endif
 
 if (ForkAndWait(settings->GetConfDir()) < 0)
 #endif
 
 if (ForkAndWait(settings->GetConfDir()) < 0)


@@ -338,7 +347,7 @@ modSettings = settings->GetModulesSettings();
 
 for (size_t i = 0; i < modSettings.size(); i++)
     {
 
 for (size_t i = 0; i < modSettings.size(); i++)
     {

-    string modulePath = settings->GetModulesPath();
+    std::string modulePath = settings->GetModulesPath();

     modulePath += "/mod_";
     modulePath += modSettings[i].moduleName;
     modulePath += ".so";
     modulePath += "/mod_";
     modulePath += modSettings[i].moduleName;
     modulePath += ".so";


@@ -363,7 +372,8 @@ while (modIter != modules.end())
     {
     if (modIter->Load())
         {
     {
     if (modIter->Load())
         {

-        WriteServLog("Error: %s",
+        WriteServLog("Error loading module '%s': %s",
+                     modIter->GetPlugin()->GetVersion().c_str(),

                      modIter->GetStrError().c_str());
         goto exitLblNotStarted;
         }
                      modIter->GetStrError().c_str());
         goto exitLblNotStarted;
         }


@@ -390,7 +400,8 @@ while (modIter != modules.end())
     {
     if (modIter->Start())
         {
     {
     if (modIter->Start())
         {

-        WriteServLog("Error: %s",
+        WriteServLog("Error starting module '%s': %s",
+                     modIter->GetPlugin()->GetVersion().c_str(),

                      modIter->GetStrError().c_str());
         goto exitLbl;
         }
                      modIter->GetStrError().c_str());
         goto exitLbl;
         }


@@ -398,7 +409,7 @@ while (modIter != modules.end())
     ++modIter;
     }
 
     ++modIter;
     }
 

-srandom(stgTime);
+srandom(static_cast<unsigned int>(stgTime));

 
 WriteServLog("Stg started successfully.");
 WriteServLog("+++++++++++++++++++++++++++++++++++++++++++++");
 
 WriteServLog("Stg started successfully.");
 WriteServLog("+++++++++++++++++++++++++++++++++++++++++++++");


@@ -415,7 +426,7 @@ while (true)
     bool stop = false;
     int status;
     pid_t childPid;
     bool stop = false;
     int status;
     pid_t childPid;

-    set<pid_t>::iterator it;
+    std::set<pid_t>::iterator it;

     switch (sig)
         {
         case SIGHUP:
     switch (sig)
         {
         case SIGHUP:


@@ -425,9 +436,9 @@ while (true)
                 {
                 if (modIter->Reload())
                     {
                 {
                 if (modIter->Reload())
                     {

-                    WriteServLog("Error reloading %s ('%s')", modIter->GetPlugin()->GetVersion().c_str(),
+                    WriteServLog("Error reloading module '%s': '%s'", modIter->GetPlugin()->GetVersion().c_str(),

                                                               modIter->GetStrError().c_str());
                                                               modIter->GetStrError().c_str());

-                    printfd(__FILE__, "Error reloading %s ('%s')\n", modIter->GetPlugin()->GetVersion().c_str(),
+                    printfd(__FILE__, "Error reloading module '%s': '%s'\n", modIter->GetPlugin()->GetVersion().c_str(),

                                                                      modIter->GetStrError().c_str());
                     }
                 }
                                                                      modIter->GetStrError().c_str());
                     }
                 }


@@ -453,7 +464,7 @@ while (true)
                 }
             break;
         default:
                 }
             break;
         default:

-            WriteServLog("Ignore signel %d", sig);
+            WriteServLog("Ignore signal %d", sig);

             break;
         }
     if (stop)
             break;
         }
     if (stop)


@@ -473,14 +484,14 @@ while (modIter != modules.end())
     printfd(__FILE__, "Stopping module '%s'\n", name.c_str());
     if (modIter->Stop())
         {
     printfd(__FILE__, "Stopping module '%s'\n", name.c_str());
     if (modIter->Stop())
         {

-        WriteServLog("Module \'%s\': Error: %s",
+        WriteServLog("Error stopping module '%s': %s",

                      modIter->GetPlugin()->GetVersion().c_str(),
                      modIter->GetStrError().c_str());
                      modIter->GetPlugin()->GetVersion().c_str(),
                      modIter->GetStrError().c_str());

-        printfd(__FILE__, "Failed to stop module '%s'\n", name.c_str());
+        printfd(__FILE__, "Error stopping module '%s': '%s'\n", modIter->GetPlugin()->GetVersion().c_str(), modIter->GetStrError().c_str());

         }
     else
         {
         }
     else
         {

-        WriteServLog("Module: \'%s\'. Stop successfull.", modIter->GetPlugin()->GetVersion().c_str());
+        WriteServLog("Module: '%s'. Stop successfull.", modIter->GetPlugin()->GetVersion().c_str());

         }
     ++modIter;
     }
         }
     ++modIter;
     }


@@ -505,10 +516,10 @@ while (modIter != modules.end())
         printfd(__FILE__, "Unloading module '%s'\n", name.c_str());
         if (modIter->Unload())
             {
         printfd(__FILE__, "Unloading module '%s'\n", name.c_str());
         if (modIter->Unload())
             {

-            WriteServLog("Module \'%s\': Error: %s",
-                         name.c_str(),
+            WriteServLog("Error unloading module '%s': '%s'",
+                         modIter->GetPlugin()->GetVersion().c_str(),

                          modIter->GetStrError().c_str());
                          modIter->GetStrError().c_str());

-            printfd(__FILE__, "Failed to unload module '%s'\n", name.c_str());
+            printfd(__FILE__, "Error unloading module '%s': '%s'\n", modIter->GetPlugin()->GetVersion().c_str(), modIter->GetStrError().c_str());

             }
         }
     ++modIter;
             }
         }
     ++modIter;