Changeset 187

Timestamp:

03/29/10 09:28:17 (15 years ago)

Author:

ogrimm

Message:

Updates to signal handling

Location:

Evidence

Files:

• Config.cc (modified) (2 diffs)
• Evidence.cc (modified) (5 diffs)
• Evidence.h (modified) (2 diffs)
• readme.txt (modified) (2 diffs)

Evidence/Config.cc

@@ -36 +36 @@
     DimService *ConfigModified;
     int ModifyTime;
-        
+
     void rpcHandler();
   
@@ -45 +45 @@
         void ConfigChanged(); 
 };
+
 
 // Constructor

Evidence/Evidence.cc

@@ -47 +47 @@
   signal(SIGINT, &SignalHandler);   // CTRL-C
   signal(SIGHUP, &SignalHandler);   // Terminal closed
-  
+
   // Catch C++ unhandled exceptions
   set_terminate(Terminate);
@@ -57 +57 @@
   string Rev(EVIDENCE_REVISION);
   Rev = Rev.substr(1, Rev.size()-3);
-  if (asprintf(&InitMsg, "Server started (%s, compiled %s %s)", Rev.c_str(),__DATE__, __TIME__) == -1) InitMsg = NULL;
+  snprintf(InitMsg, sizeof(InitMsg), "Server started (%s, compiled %s %s)", Rev.c_str(),__DATE__, __TIME__);
   
   Status = new DimService((ServerName+"/Status").c_str(), (char *) "C", InitMsg, strlen(InitMsg)+1);
@@ -68 +68 @@
 EvidenceServer::~EvidenceServer() {
 
-  free(InitMsg);
   State(INFO, "Server stopped");
   
@@ -79 +78 @@
 // DIM exit handler
 void EvidenceServer::exitHandler(int Code) {
+
   State(INFO, "Exit handler called (DIM exit code %d)", Code);
   exit(EXIT_SUCCESS);
@@ -181 +181 @@
 
 // Signal handler (causes pause() and other syscalls to return)
-void EvidenceServer::SignalHandler(int) {
-
-  ThisServer->ExitRequest = true;
+void EvidenceServer::SignalHandler(int Signal) {
+
+  static bool Called = false;
+
+  if (!Called) {
+        Called = true;
+        ThisServer->ExitRequest = true;
+        return;
+  }
+
+  // If invoked twice, call exit()
+  ThisServer->State(ThisServer->WARN, "Signal handler called again, invoking exit() (signal %d)", Signal);
+  exit(EXIT_FAILURE);
 }
 

Evidence/Evidence.h

@@ -20 +20 @@
 class EvidenceServer: public DimServer {
   private:
-
         // This class will contain in LastModifyTime always
         // the unix time of the last config file update 
@@ -51 +50 @@
         class ConfigUpdate *ModifyInfo;
         
-        char *InitMsg;
+        char InitMsg[STATUS_SIZE];
         int LastModifyTime;
 

Evidence/readme.txt

@@ -5 +5 @@
 Config is the configuration server and needs to run before any other DIM
 server that requests configuration information is started (if a configuration
-request cannot be answered, a server will normally not start). As default,
-it reads Evidence.conf in the config subdirectory. A different configuration
+request cannot be answered, a server will normally not start). A configuration
 file can be given on the command line.
 
@@ -18 +17 @@
 
 The DIMDIR environment variable needs to point to the DIM installation directory
-when compiling. DIM_DNS_NODE must point to a name server for any DIM server
+when compiling. DIM_DNS_NODE must point to the name server for any DIM server
 to run.