Changeset 253 for Evidence/Evidence.cc

Timestamp:

07/20/10 12:34:13 (14 years ago)

Author:

ogrimm

Message:

Added command ResetAlarm, Evidence servers now always safely translate a DIM string into a C string, added documentation, replaced several vectors my maps

File:

• Evidence/Evidence.cc (modified) (5 diffs)

Evidence/Evidence.cc

@@ -134 +134 @@
 //////////////////////////
 
+// Initialise
 int EvidenceServer::ConfigSignal = 0;
 EvidenceServer *EvidenceServer::This = NULL;
 
-// Constructor starts server with given name
-EvidenceServer::EvidenceServer(const char *ServerName): Name(ServerName) {
+// Constructor
+EvidenceServer::EvidenceServer(string ServerName): Name(ServerName) {
 
   // Initialize
@@ -176 +177 @@
 
   // Start server
-  start(ServerName);
+  start(ServerName.c_str());
   addExitHandler(this);
 }
@@ -184 +185 @@
 
   Message(INFO, "Server stopped");
-  
+
   delete ConfClass;
-  delete MessageService;
-  delete[] MessageData;
-  
+
   int Ret;
   if ((Ret = pthread_mutex_destroy(&Mutex)) != 0) {
         Message(ERROR, "pthread_mutex_destroy() failed (%s)", strerror(Ret));
   }
+  
+  delete MessageService;
+  delete[] MessageData;  
 }
 
@@ -203 +205 @@
 
 // DIM error handler
-void EvidenceServer::errorHandler(int Severity, int Code, char *Text) {   
+void EvidenceServer::errorHandler(int Severity, int Code, char *Text) {
+
   Message(ERROR, "%s (DIM error code %d, DIM severity %d)\n", Text, Code, Severity);
 }
@@ -233 +236 @@
   SendToLog("%s (%s): %s", MessageService->getName(), StateString[Severity], NewMsg->Text);
 
-  // Update DIM message service, then delete old message
+  // Update DIM message service
   if (MessageService != NULL) {
         MessageService->updateService(NewMsg, sizeof(struct Message)+strlen(NewMsg->Text)+1);
   }
+
+  // Terminate if severity if FATAL  
+  if (Severity == FATAL) exit(EXIT_FAILURE);
+
+  // Delete old message
+  // Note that Lock()/Unlock() might fail with a FATAL message. To avoid an infinite loop,
+  // check for FATAL severity is done before here.
+  Lock();
   delete[] MessageData;
   MessageData = NewMsg;
-
-  // Terminate if severity if FATAL  
-  if (Severity == FATAL) exit(EXIT_FAILURE);
+  Unlock();  
 }