Changeset 174 for Evidence/Evidence.cc

Timestamp:

03/05/10 15:06:15 (15 years ago)

Author:

ogrimm

Message:

Update to configuration handling: Dim request only made if configuration file was modified since last request

File:

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

Evidence/Evidence.cc

@@ -34 +34 @@
 EvidenceServer *ThisServer;
 
+
 // Constructor starts server with given name
 EvidenceServer::EvidenceServer(const char *Name) {
@@ -50 +51 @@
   // Catch C++ unhandled exceptions
   set_terminate(Terminate);
+
+  // Subscribe to modify service for keeping track of config file changes
+  ModifyInfo = new class ConfigUpdate();
   
   // Start server
@@ -72 +76 @@
         delete[] ConfigList[i].Value;
   }
+  delete ModifyInfo;
 }
 
@@ -125 +130 @@
 }
 
-// Get configuration data (program terminates if data is missing)
+// Get configuration data
 //
+// Program terminates if data is missing and no default given. Actual configuration
+// request will be made only if config file has modification since last request.
 // The memory allocated by all calls to this function will be freed by
 // the destructor.
 char* EvidenceServer::GetConfig(const char *Item, const char *Default) {
   
-  // Determine configuration file update time
-  DimCurrentInfo ModifyTime("Config/ModifyTime", 0);
-  int Time = ModifyTime.getInt(), ItemNo = -1;
+  int ItemNo = -1;
   
   // Check if configuration request already in list
@@ -139 +144 @@
     if (strcmp(ConfigList[i].Name, Item) == 0) {
           // Return original value if still up to date
-          if (ConfigList[i].Time >= Time) return ConfigList[i].Value;
+          if (ConfigList[i].Time >= ModifyInfo->LastModifyTime) return ConfigList[i].Value;
 
           // Otherwise, free memory of old value
@@ -172 +177 @@
   strcpy(ConfigList[ItemNo].Name, Item);
   strcpy(ConfigList[ItemNo].Value, Result);
-  ConfigList[ItemNo].Time = Time;
+  ConfigList[ItemNo].Time = ModifyInfo->LastModifyTime;
     
   // Return address to configuration value  
@@ -310 +315 @@
 
 // Constructor
-EvidenceHistory::EvidenceHistory() {
+EvidenceHistory::EvidenceHistory(std::string Name, int Delay):
+        Name(Name+".hist"),
+        Delay(Delay) {
 
   Buffer = NULL;
+  LastUpdate = 0;
 }
 
@@ -322 +330 @@
 
 // Requests service history
-bool EvidenceHistory::GetHistory(char *Name) {
-
-  DimCurrentInfo Info((string(Name)+".hist").c_str(), NO_LINK);
-
+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;