Changeset 209 for Evidence/Evidence.cc

Timestamp:

05/19/10 09:08:40 (14 years ago)

Author:

ogrimm

Message:

Service histories now available via DimRpc from DColl

File:

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

Evidence/Evidence.cc

@@ -38 +38 @@
   // Initialize
   Status = NULL;
+  StdOutText = NULL;
   ExitRequest = false;
   ThisServer = this;
@@ -60 +61 @@
   
   Status = new DimService((ServerName+"/Status").c_str(), (char *) "C", InitMsg, strlen(InitMsg)+1);
+  StdOut = new DimService((ServerName+"/Textout").c_str(), (char *) "");
 
   start(Name);
@@ -74 +76 @@
   }
   delete ModifyInfo;
+  
+  delete Status;
+  delete StdOut;
 }
 
@@ -126 +131 @@
   // Terminate if message type is 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;    
 }
 
@@ -148 +166 @@
         break;
   } 
-  
+
   // Make configuration request
-  DimRpcInfo Config((char *) "ConfigRequest", (char *) "");
+  DimRpcInfo Config((char *) "ConfigRequest", NO_LINK);
   Config.setData((char *) (ServerName + " " + Item).c_str());
   char *Result = Config.getString();
-  
+
   // Terminate if not successful
+  if (!EvidenceServer::ServiceOK(&Config)) {
+    State(FATAL, "Configuration server unreachable, can't get '%s'", Item.c_str());
+  }
+
   if (strlen(Result) == 0) {
     if (Default == NULL) State(FATAL, "Missing configuration data '%s'", Item.c_str());
@@ -172 +194 @@
   strcpy(ConfigList[ItemNo].Value, Result);
   ConfigList[ItemNo].Time = ModifyInfo->LastModifyTime;
-    
+
   // Return address to configuration value  
   return ConfigList[ItemNo].Value;
@@ -314 +336 @@
   return !((Item->getSize() == strlen(NO_LINK)+1) &&  
           (memcmp(Item->getData(), NO_LINK, Item->getSize()) == 0));
-
-}
-
+}
+
+bool EvidenceServer::ServiceOK(DimRpcInfo *Item) {
+
+  return !((Item->getSize() == strlen(NO_LINK)+1) &&  
+          (memcmp(Item->getData(), NO_LINK, Item->getSize()) == 0));
+}
 
 ///////////////////////////
@@ -333 +359 @@
 
 // Constructor
-EvidenceHistory::EvidenceHistory(std::string Name, int Delay):
-        Name(Name+".hist"),
-        Delay(Delay) {
+EvidenceHistory::EvidenceHistory(std::string Name):     Name(Name) {
 
   Buffer = NULL;
-  LastUpdate = 0;
 }
 
@@ -350 +373 @@
 bool EvidenceHistory::GetHistory() {
 
-  // Check if last buffer update less than minimum delay in the past 
-  if ((Buffer != NULL) && (time(NULL)-LastUpdate < Delay)) {
-        Offset = *(int *) Buffer;
-        return true;
-  }
-  LastUpdate = time(NULL);
-  
-  // Check if service available
-  DimCurrentInfo Info(Name.c_str(), NO_LINK);
-  if (((Info.getSize() == strlen(NO_LINK)+1) &&  
-          (memcmp(Info.getData(), NO_LINK, Info.getSize()) == 0))) return false;
+  DimRpcInfo R((char *) "ServiceHistory", NO_LINK);
+  R.setData((char *) Name.c_str());
+  if (!EvidenceServer::ServiceOK(&R)) return false;
 
   delete[] Buffer;
-  BufferSize = Info.getSize();
+  BufferSize = R.getSize();
   Buffer = new char [BufferSize];
 
-  memcpy(Buffer, Info.getData(), BufferSize);
+  memcpy(Buffer, R.getData(), BufferSize);
   Offset = *(int *) Buffer;