A bit better Makefile

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

diff --git a/projects/stargazer/main.cpp b/projects/stargazer/main.cpp
index 63d5a6b09454f422c4d91253c2ca469b03670276..6bbd7b9d6b62393026356f3bcad728494130fd2a 100644 (file)
--- a/projects/stargazer/main.cpp
+++ b/projects/stargazer/main.cpp
@@ -24,21 +24,17 @@
  $Author: faust $
  */
 
  $Author: faust $
  */
 

-/*#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>*/

 #include <unistd.h>
 #include <sys/ipc.h>
 #include <sys/msg.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <unistd.h>
 #include <sys/ipc.h>
 #include <sys/msg.h>
 #include <sys/types.h>
 #include <sys/wait.h>

-/*#include <sys/stat.h>
-#include <dlfcn.h>
-#include <fcntl.h>*/
+#include <sys/stat.h> // S_IRUSR
+#include <fcntl.h> // create

 
 #include <csignal>
 #include <cerrno>
 
 #include <csignal>
 #include <cerrno>

+#include <cstdio>

 #include <fstream>
 #include <vector>
 #include <set>
 #include <fstream>
 #include <vector>
 #include <set>


@@ -50,7 +46,7 @@
 #include "admins_impl.h"
 #include "tariffs_impl.h"
 #include "common.h"
 #include "admins_impl.h"
 #include "tariffs_impl.h"
 #include "common.h"

-#include "traffcounter.h"
+#include "traffcounter_impl.h"

 #include "plugin.h"
 #include "stg_logger.h"
 #include "stg_timer.h"
 #include "plugin.h"
 #include "stg_logger.h"
 #include "stg_timer.h"


@@ -386,6 +382,7 @@ switch (stgChildPid)
         break;
 
     default:
         break;
 
     default:

+        struct timespec ts = {0, 200000000};

         for (int i = 0; i < 120 * 5; i++)
             {
             if (access(startFile.c_str(), F_OK) == 0)
         for (int i = 0; i < 120 * 5; i++)
             {
             if (access(startFile.c_str(), F_OK) == 0)


@@ -399,7 +396,7 @@ switch (stgChildPid)
                 unlink(startFile.c_str());
                 exit(1);
                 }
                 unlink(startFile.c_str());
                 exit(1);
                 }

-            usleep(200000);
+            nanosleep(&ts, NULL);

             }
         unlink(startFile.c_str());
         exit(1);
             }
         unlink(startFile.c_str());
         exit(1);


@@ -447,7 +444,7 @@ STORE * dataStore = NULL;
 TARIFFS_IMPL * tariffs = NULL;
 ADMINS_IMPL * admins = NULL;
 USERS_IMPL * users = NULL;
 TARIFFS_IMPL * tariffs = NULL;
 ADMINS_IMPL * admins = NULL;
 USERS_IMPL * users = NULL;

-TRAFFCOUNTER * traffCnt = NULL;
+TRAFFCOUNTER_IMPL * traffCnt = NULL;

 int msgID = -11;
 
     {
 int msgID = -11;
 
     {


@@ -544,7 +541,7 @@ WriteServLog("Storage plugin: %s. Loading successfull.", dataStore->GetVersion()
 tariffs = new TARIFFS_IMPL(dataStore);
 admins = new ADMINS_IMPL(dataStore);
 users = new USERS_IMPL(settings, dataStore, tariffs, admins->GetSysAdmin());
 tariffs = new TARIFFS_IMPL(dataStore);
 admins = new ADMINS_IMPL(dataStore);
 users = new USERS_IMPL(settings, dataStore, tariffs, admins->GetSysAdmin());

-traffCnt = new TRAFFCOUNTER(users, tariffs, settings->GetRulesFileName());
+traffCnt = new TRAFFCOUNTER_IMPL(users, tariffs, settings->GetRulesFileName());

 traffCnt->SetMonitorDir(settings->GetMonitorDir());
 
 modSettings = settings->GetModulesSettings();
 traffCnt->SetMonitorDir(settings->GetMonitorDir());
 
 modSettings = settings->GetModulesSettings();