Changeset 224 for Evidence/Evidence.cc

Timestamp:

06/17/10 09:00:51 (14 years ago)

Author:

ogrimm

Message:

Message severity encoded now using standard DIM structure, other updates

File:

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

Evidence/Evidence.cc

@@ -5 +5 @@
   - The server is started with the given name.
   - DIM exit and error handlers are implemented.
-  - The Message service is published (special format, see below).
-    It can be updated with the Message() method. The text will also be logged.
+  - A Message service is published with severity encoding. It can be updated
+    with the Message() method. The text will also be logged.
   - If the severity of a Message() call is FATAL, exit() will be called (with
     this severity, the call to Message() is guranteed not to return).
@@ -16 +16 @@
     DIMInfo service into text
   - A terminate-handler is installed for catching unhandled C++ exceptions.
-  
-  All memory allocated by the non-static methods will be freed by the
+
+  Memory allocated by the non-static methods will be freed by the
   class destructor.
   
-  Oliver Grimm, March 2009
+  Oliver Grimm, June 2010
  
 \********************************************************************/
@@ -37 +37 @@
 
   // Initialize
-  Status = NULL;
-  StdOutText = NULL;
+  MessageService = NULL;
+  MessageData = NULL;
   ExitRequest = false;
   ThisServer = this;
@@ -54 +54 @@
   // Subscribe to modify service for keeping track of config file changes
   ModifyInfo = new class ConfigUpdate();
-  
+
+  // Message service and initial message
+  MessageService = new DimService((ServerName+"/Message").c_str(), (char *) "I:1;C", NULL, 0);
+
+  string Rev(EVIDENCE_REVISION); 
+  Message(INFO, "Server started (%s, compiled %s %s)", (Rev.substr(1, Rev.size()-3)).c_str(),__DATE__, __TIME__);
+
   // Start server
-  string Rev(EVIDENCE_REVISION);
-  Rev = Rev.substr(1, Rev.size()-3);
-  snprintf(InitMsg, sizeof(InitMsg), "Server started (%s, compiled %s %s)", Rev.c_str(),__DATE__, __TIME__);
-  
-  Status = new DimService((ServerName+"/Message").c_str(), (char *) "C", InitMsg, strlen(InitMsg)+1);
-  StdOut = new DimService((ServerName+"/Textout").c_str(), (char *) "");
-
   start(Name);
-  addExitHandler(this);
+  addExitHandler(this);  
 }
 
@@ -72 +71 @@
   Message(INFO, "Server stopped");
   
-  for (unsigned int i=0; i<ConfigList.size(); i++) {
-        delete[] ConfigList[i].Value;
-  }
+  for (unsigned int i=0; i<ConfigList.size(); i++) delete[] ConfigList[i].Value;
   delete ModifyInfo;
-  
-  delete Status;
-  delete StdOut;
+  delete MessageService;
+  delete MessageData;
 }
 
@@ -90 +86 @@
 // DIM error handler
 void EvidenceServer::errorHandler(int Severity, int Code, char *Text) {   
-  Message(ERROR, "%s (DIM error code %d, severity %d)\n", Text, Code, Severity);
-}
-
-// Set status of server
-//
-// The message format is special: after the string-terminating '\0' the Severity 
-// is given, terminated by another '\0'  The buffer for the DIM service must have
-// the same lifetime as the DIM service. If Severity is FATAL, exit() will be invoked.
+  Message(ERROR, "%s (DIM error code %d, DIM severity %d)\n", Text, Code, Severity);
+}
+
+// Set server message (if Severity is FATAL, exit() will be invoked)
 void EvidenceServer::Message(MessageType Severity, const char *Format, ...) {
 
   static const char* StateString[] = {"Info", "Warn", "Error", "Fatal"};
   static char ErrorString[] = "vasprintf() failed in Message()";
-  static char SBuf[STATUS_SIZE];
-  char TBuf[STATUS_SIZE];
-  char *Tmp;
+  char *Text;
   
   // Assemble message from application
   va_list ArgumentPointer;
   va_start(ArgumentPointer, Format);
-  if (vasprintf(&Tmp, Format, ArgumentPointer) == -1) Tmp = ErrorString;
+  if (vasprintf(&Text, Format, ArgumentPointer) == -1) {
+        Text = ErrorString;
+        Severity = ERROR;
+  }
   va_end(ArgumentPointer);
 
-  // Create normal string
-  snprintf(TBuf, sizeof(TBuf), "%s (%s): %s", Status->getName(), StateString[Severity], Tmp);
-
-  // Create string with severity encoding
-  snprintf(SBuf, sizeof(SBuf), "%s*", Tmp);
-  SBuf[strlen(SBuf)-1] = '\0';          // new string terminiation replaces '*'
-  SBuf[strlen(SBuf)+1] = Severity;      // Severity after new string termination
-
-  if (Tmp != ErrorString) free(Tmp);
+  // Generate new Message structure and free text
+  struct Message *NewMsg = (struct Message *) new char [sizeof(struct Message)+strlen(Text)+1];
+  NewMsg->Severity = Severity;
+  strcpy(NewMsg->Text, Text);
+  if (Text != ErrorString) free(Text);
   
   // Send message to console and log file
-  printf("%s\n", TBuf);
-  DimClient::sendCommandNB("DColl/Log", TBuf);
-
-  // Update DIM status service (including severity encoding)
-  if (Status != NULL) Status->updateService(SBuf, strlen(SBuf)+2);
-
-  // Terminate if message type is fatal
+  printf("%s (%s): %s\n", MessageService->getName(), StateString[Severity], NewMsg->Text);
+  SendToLog("%s (%s): %s", MessageService->getName(), StateString[Severity], NewMsg->Text);
+
+  // Update DIM message service, then delete old message
+  if (MessageService != NULL) {
+        MessageService->updateService(NewMsg, sizeof(struct Message)+strlen(NewMsg->Text)+1);
+  }
+  delete MessageData;
+  MessageData = NewMsg;
+
+  // Terminate if severity if FATAL  
   if (Severity == FATAL) exit(EXIT_FAILURE);
 }
 
-// Set text of StdOut service
-void EvidenceServer::SetStdOut(char *Text) {
-
-  // Copy text to permanent buffer
-  char *Tmp = new char[strlen(Text)+1];
-  strcpy(Tmp, Text);
-  StdOut->updateService(Tmp);
-
-  // Delete old buffer and save new buffer pointer
-  delete[] StdOutText;
-  StdOutText = Tmp;    
-}
+
+// Set to central logging server with non-blocking command (may be used in DIM handler)
+void EvidenceServer::SendToLog(const char *Format, ...) {
+
+  char *Buffer;
+  int Ret;
+
+  // Evaluate variable argument list
+  va_list ArgumentPointer;
+  va_start(ArgumentPointer, Format);
+  Ret = vasprintf(&Buffer, Format, ArgumentPointer);
+  va_end(ArgumentPointer);
+
+  // Send to logger
+  if (Ret != -1) {
+        DimClient::sendCommandNB("DColl/Log", Buffer);
+        free (Buffer);
+  }
+  else Message(ERROR, "Could not create logging text in SendToLog(), vasprintf() failed");
+}
+
 
 // Get configuration data
@@ -191 +193 @@
 
   // Create new entry in item list, allocate memory and copy data to this memory
+  ConfigList[ItemNo].Name = Item;
   ConfigList[ItemNo].Value = new char [strlen(Result)+1];
-  ConfigList[ItemNo].Name = Item;
   strcpy(ConfigList[ItemNo].Value, Result);
   ConfigList[ItemNo].Time = ModifyInfo->LastModifyTime;
@@ -208 +210 @@
   static bool Called = false;
 
+  // At first invocation just request exit
   if (!Called) {
         Called = true;
@@ -226 +229 @@
 
   if (Terminating) {
-        snprintf(Msg, sizeof(Msg), "%s: Terminate() called recursively, calling abort()", ThisServer->Status->getName());
+        snprintf(Msg, sizeof(Msg), "%s: Terminate() called recursively, calling abort()", ThisServer->MessageService->getName());
         printf("%s\n", Msg);
         DimClient::sendCommandNB("DColl/Log", Msg);
@@ -259 +262 @@
 
 // Translates DIMInfo to string (memory has to be freed by caller)
-// Static method: it cannot report memory allocation errors via Message()
+// Static method, cannot report memory allocation errors via Message() but returns NULL
 char *EvidenceServer::ToString(DimInfo *Item) {
 
@@ -266 +269 @@
   // Safety check
   if (Item->getSize() < 1) return NULL;
+
+  // Message structure format handled
+  if (strcmp(Item->getFormat(), "I:1;C") == 0) {
+        struct Message *Msg = (struct Message *) Item->getData();
+        if (asprintf(&Text, "%d %s", Msg->Severity, Msg->Text) == -1) return NULL;
+        else return Text;
+  }
   
   // Structure: print hex representation (3 characters per byte)