У класі USER видалено пустий метод RemoveMessage

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

diff --git a/projects/stargazer/main.cpp b/projects/stargazer/main.cpp
index 7c9945b080670215343fa2736f67a5315b22918e..7a225ce5de4061f7d837d02ba863b31db9ab7532 100644 (file)
--- a/projects/stargazer/main.cpp
+++ b/projects/stargazer/main.cpp
@@ -93,7 +93,7 @@ class STG_STOPPER
 {
 public:
     STG_STOPPER() { nonstop = true; }
 {
 public:
     STG_STOPPER() { nonstop = true; }

-    bool    GetStatus() { return nonstop; };
+    bool    GetStatus() const { return nonstop; };

     #ifdef NO_DAEMON
     void    Stop(const char * __file__, int __line__)
     #else
     #ifdef NO_DAEMON
     void    Stop(const char * __file__, int __line__)
     #else


@@ -128,12 +128,6 @@ else
     }
 }
 //-----------------------------------------------------------------------------
     }
 }
 //-----------------------------------------------------------------------------

-void CatchPROF(int)
-{
-/*STG_LOGGER & WriteServLog = GetStgLogger();
-WriteServLog("CatchPROF");*/
-}
-//-----------------------------------------------------------------------------

 void CatchUSR1(int)
 {
 
 void CatchUSR1(int)
 {
 


@@ -203,10 +197,10 @@ if (childPid == stgChildPid)
     childExited = true;
     }
 }
     childExited = true;
     }
 }

-//-----------------------------------------------------------------------------
+/*//-----------------------------------------------------------------------------

 void CatchSEGV(int, siginfo_t *, void *)
 {
 void CatchSEGV(int, siginfo_t *, void *)
 {

-/*char fileName[50];
+char fileName[50];

 sprintf(fileName, "/tmp/stg_segv.%d", getpid());
 FILE * f = fopen(fileName, "wt");
 if (f)
 sprintf(fileName, "/tmp/stg_segv.%d", getpid());
 FILE * f = fopen(fileName, "wt");
 if (f)


@@ -254,8 +248,8 @@ segv_action.sa_sigaction = NULL;
 segv_action.sa_flags = SA_SIGINFO;
 segv_action.sa_restorer = NULL;
 
 segv_action.sa_flags = SA_SIGINFO;
 segv_action.sa_restorer = NULL;
 

-sigaction(SIGSEGV, &segv_action, &segv_action_old);*/
-}
+sigaction(SIGSEGV, &segv_action, &segv_action_old);
+}*/

 //-----------------------------------------------------------------------------
 static void SetSignalHandlers()
 {
 //-----------------------------------------------------------------------------
 static void SetSignalHandlers()
 {


@@ -282,13 +276,6 @@ newsa.sa_handler = CatchTERM;
 newsa.sa_mask = sigmask;
 newsa.sa_flags = 0;
 sigaction(SIGINT, &newsa, &oldsa);
 newsa.sa_mask = sigmask;
 newsa.sa_flags = 0;
 sigaction(SIGINT, &newsa, &oldsa);

-/*///////
-sigemptyset(&sigmask);
-sigaddset(&sigmask, SIGPROF);
-newsa.sa_handler = CatchPROF;
-newsa.sa_mask = sigmask;
-newsa.sa_flags = 0;
-sigaction(SIGPROF, &newsa, &oldsa);*/

 //////
 sigemptyset(&sigmask);
 sigaddset(&sigmask, SIGPIPE);
 //////
 sigemptyset(&sigmask);
 sigaddset(&sigmask, SIGPIPE);