Changeset 255 for Evidence/Evidence.cc

Timestamp:

07/21/10 15:07:37 (14 years ago)

Author:

ogrimm

Message:

Added special handling of code 0 in exitHandler(), fixed recursion bug in Lock()/Unlock() by not calling Message()

File:

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

Evidence/Evidence.cc

@@ -122 +122 @@
           // Return current value
           Result = List[Item].Value;
-          This->Unlock();
         }
+        This->Unlock();
   }
 
@@ -200 +200 @@
 void EvidenceServer::exitHandler(int Code) {
 
-  Message(INFO, "Exit handler called (DIM exit code %d)", Code);
-  exit(EXIT_SUCCESS);
+  if (Code == 0) Message(INFO, "Message cleared by %s (ID %d)", getClientName(), getClientId());
+  else {
+        Message(INFO, "Exit handler called (DIM exit code %d)", Code);
+        exit(EXIT_SUCCESS);
+  }
 }
 
@@ -241 +244 @@
   }
 
-  // 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;
   Unlock();  
-}
-
-
-// Set to central logging server with non-blocking command (may be used in DIM handler)
+
+  // Terminate if severity if FATAL  
+  if (Severity == FATAL) exit(EXIT_FAILURE);
+}
+
+
+// Send to central logging server with non-blocking command
 void EvidenceServer::SendToLog(const char *Format, ...) {
 
+  static char ErrorString[] = "vasprintf() failed in SendToLog()";
   char *Buffer;
   int Ret;
@@ -271 +273 @@
         free (Buffer);
   }
-  else Message(ERROR, "Could not create logging text in SendToLog(), vasprintf() failed");
+  else DimClient::sendCommandNB("DColl/Log", ErrorString);
 }
 
@@ -300 +302 @@
 
 
-// Locking and unlocking for list access
-// Signal blocked before locking to avoid dead-lock by calling GetConfig() from ConfigChanged().
+// Locking and unlocking functions.
+// Signal blocked before locking (pthread_mutex_lock() not asynch-signal safe).
+// Message() is not used to avoid infinite recursion
 void EvidenceServer::Lock() {
 
@@ -312 +315 @@
         Ret += abs(pthread_sigmask(SIG_BLOCK, &Set, NULL));
 
-        if (Ret != 0) Message(FATAL, "Signal masking failed in Lock()");
+        if (Ret != 0) {
+          printf("Signal masking failed in Lock()");
+          SendToLog("Signal masking failed in Lock()");
+          exit(EXIT_FAILURE);
+        }
   }
 
   if ((Ret = pthread_mutex_lock(&Mutex)) != 0) {
-        Message(FATAL, "pthread_mutex_lock() failed in Lock() (%s)", strerror(Ret));
+        printf("pthread_mutex_lock() failed in Lock() (%s)", strerror(Ret));
+        SendToLog("pthread_mutex_lock() failed in Lock() (%s)", strerror(Ret));
+        exit(EXIT_FAILURE);
   }
 }
@@ -326 +335 @@
 
   if ((Ret = pthread_mutex_unlock(&Mutex)) != 0) {
-        Message(FATAL, "pthread_mutex_unlock() failed in Unlock() (%s)", strerror(Ret));
+        printf("pthread_mutex_unlock() failed in Unlock() (%s)", strerror(Ret));
+        SendToLog("pthread_mutex_unlock() failed in Unlock() (%s)", strerror(Ret));
+        exit(EXIT_FAILURE);
   }
   
@@ -334 +345 @@
         Ret += abs(pthread_sigmask(SIG_UNBLOCK, &Set, NULL));
 
-        if (Ret != 0) Message(FATAL, "Signal unmasking failed in Unlock()");
+        if (Ret != 0) {
+          printf("Signal unmasking failed in Unlock()");
+          SendToLog("Signal unmasking failed in Unlock()");
+          exit(EXIT_FAILURE);
+        }
   }
 }