Changeset 152 for Evidence/Evidence.cc

Timestamp:

01/27/10 15:28:06 (15 years ago)

Author:

ogrimm

Message:

Updates

File:

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

Evidence/Evidence.cc

@@ -26 +26 @@
 
 bool EvidenceServer::ExitRequest = false;
+string __StatusName;
 
 // Constructor starts server with given name
@@ -34 +35 @@
   ConfigList = NULL;
   ConfigNum = 0;
+  __StatusName = string(Name) + "/Status";
   
   // Catch some signals
@@ -41 +43 @@
   signal(SIGHUP, &SignalHandler);   // Terminal closed
   
-  // Create server name
-  if (MakeString(&StatusName, "%s/Status", Name) == -1) {
-    State(FATAL, "Could not generate service name, asprintf() failed");
-  }
+  // Catch C++ unhandled exceptions
+  set_terminate(Terminate);
   
   // Start server
-  Status = new DimService(StatusName, (char *) "Server started");
+  Status = new DimService(__StatusName.c_str(), (char *) "Server started");
 
   start(Name);
@@ -56 +56 @@
 EvidenceServer::~EvidenceServer() {
 
-  free(StatusName);
-  
   for (unsigned int i=0; i<ConfigNum; i++) {
         delete[] ConfigList[i].Name;
@@ -95 +93 @@
   va_end(ArgumentPointer);
 
-  snprintf(TBuf, sizeof(TBuf), "%s (%s): %s", StatusName, StateString[Severity], Tmp); // Normal string
+  snprintf(TBuf, sizeof(TBuf), "%s (%s): %s", __StatusName.c_str(), StateString[Severity], Tmp); // Normal string
   snprintf(SBuf, sizeof(SBuf), "%s*%c", Tmp, (char) Severity);
   *(strrchr(SBuf, '*')) = '\0';  // String with severity encoding
@@ -115 +113 @@
 // The memory allocated by all calls to this function will be freed by
 // the destructor.
-char* EvidenceServer::GetConfig(const char *Item) {
+char* EvidenceServer::GetConfig(const char *Item, const char *Default) {
   
   // Determine configuration file update time
@@ -138 +136 @@
   DimRpcInfo Config((char *) "ConfigRequest", (char *) "");
   Config.setData((char *) Item);
-
+  char *Result = Config.getString();
+  
   // Terminate if not successful
-  if (strlen(Config.getString()) == 0) {
-    State(FATAL, "Missing configuration data '%s'", Item);
+  if (strlen(Result) == 0) {
+    if (Default == NULL) State(FATAL, "Missing configuration data '%s'", Item);
+        Result = (char *) Default;
   }
 
@@ -157 +157 @@
   
   // Allocate memory for strings, and copy data to this memory
-  ConfigList[ItemNo].Value = new char [strlen(Config.getString())+1];
+  ConfigList[ItemNo].Value = new char [strlen(Result)+1];
   ConfigList[ItemNo].Name = new char [strlen(Item)+1];
   strcpy(ConfigList[ItemNo].Name, Item);
-  strcpy(ConfigList[ItemNo].Value, Config.getString());
+  strcpy(ConfigList[ItemNo].Value, Result);
 
   ConfigList[ItemNo].Time = Time;
@@ -175 +175 @@
 
   EvidenceServer::ExitRequest = true;
+}
+
+// C++ exception handler
+void EvidenceServer::Terminate() {
+
+  string Msg = __StatusName + ": Caught unhandled exception";
+  printf("%s\n", Msg.c_str());
+  DimClient::sendCommand("DColl/Log", Msg.c_str());
+  
+  abort();
 }
 
@@ -182 +192 @@
 
   char *Text;
+  int R;
   
   if (strlen(Item->getFormat()) != 1) return NULL;
   
   switch (*(Item->getFormat())) {
-    case 'I':  MakeString(&Text, "%d", Item->getInt());   break;
-    case 'C':  MakeString(&Text, "%s", Item->getString());   break;
-    case 'S':  MakeString(&Text, "%hd", Item->getShort());   break;
-    case 'F':  MakeString(&Text, "%.5f", Item->getFloat());   break;
-    case 'D':  MakeString(&Text, "%.5f", Item->getDouble());   break;
-    case 'X':  MakeString(&Text, "%lld", Item->getLonglong());   break;
+    case 'I':  R = asprintf(&Text, "%d", Item->getInt());   break;
+    case 'C':  R = asprintf(&Text, "%s", Item->getString());   break;
+    case 'S':  R = asprintf(&Text, "%hd", Item->getShort());   break;
+    case 'F':  R = asprintf(&Text, "%.5f", Item->getFloat());   break;
+    case 'D':  R = asprintf(&Text, "%.5f", Item->getDouble());   break;
+    case 'X':  R = asprintf(&Text, "%lld", Item->getLonglong());   break;
     default: return NULL;
   }
 
-  return Text;
-}
-
-//
-// Generate string with vasprintf()
-//
-// The pointer will be set to NULL in case of error, so can always safely passed to free().
-// In case vasprintf() is not available on a particular system, the functionality can
-// be manually implemented in this routine. 
-//
-int EvidenceServer::MakeString(char **Pointer, const char *Format, ...) {
-
-  int Ret;
-  va_list ArgumentPointer;  
-
-  va_start(ArgumentPointer, Format);  
-  if ((Ret = vasprintf(Pointer, Format, ArgumentPointer)) == -1) Pointer = NULL;
-  va_end(ArgumentPointer);
-  
-  return Ret;
-}
+  return (R == -1) ? NULL : Text;
+}