Changeset 11088 for fact/Evidence/History.cc

Timestamp:

06/21/11 12:52:38 (13 years ago)

Author:

ogrimm

Message:

Updates to Edd. History server now periodically saves histories to disk.

File:

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

fact/Evidence/History.cc

@@ -31 +31 @@
 const string DEFAULT_MAX_SIZE_KB = "2000";
 const string DEFAULT_NUM_ENTRIES = "1000";      // Number of entries in each history buffer
+const double MIN_SAVE_PERDIOD = 0.5;                    // Minimum period between saving history buffers in hours
 
 //
@@ -44 +45 @@
           double MinAbsChange;
           string Format;
+          time_t LastSave;
         };
         map<string, struct Item> Map;
@@ -55 +57 @@
         void AddService(string, const char *);
         void RemoveService(string);
+        void SaveHistory(string);
         off_t FileSize(FILE *);
         FILE *OpenFile(string, const char *);
@@ -73 +76 @@
   GetConfig("maxsize_kb", DEFAULT_MAX_SIZE_KB);
   GetConfig("numentries", DEFAULT_NUM_ENTRIES);
+  GetConfig("saveperiod", "1");
   GetConfig("exclude", "");
 
@@ -95 +99 @@
   // Check if service available
   if (!ServiceOK(I)) return;
-
+  
   // ====== Part A: Handle service subscriptions ===
   
@@ -143 +147 @@
   if (Map.count(Service) == 0 || I->getSize()==0 || I->getTimestamp()<=0) return;
 
+  // Save history buffers periodically (in case of program crash)
+  if (time(NULL)-Map[Service].LastSave > max(atof(GetConfig("saveperiod").c_str()),MIN_SAVE_PERDIOD)*3600) {
+    Map[Service].LastSave = time(NULL);
+        SaveHistory(Service);
+  }
+
   // Resize buffer if necessary
   int NEntries = atoi(GetConfig("numentries").c_str());
@@ -266 +276 @@
   Map[Name].Format = Format;
   Map[Name].MinAbsChange = 0.0;
+  Map[Name].LastSave = 0.0;
   
   // Set minimum required change if given in configuratrion
@@ -319 +330 @@
 
   // Save history buffer
+  SaveHistory(Name);
+
+  Map.erase(Name);
+}
+
+
+//
+// Save history buffer to file
+//
+void History::SaveHistory(string Name) {
+
   FILE *File = OpenFile(Name, "wb");
+
   if (File != NULL) {
     fwrite(&Map[Name].Next, sizeof(Map[Name].Next), 1, File);                                   // Next pointer
@@ -327 +350 @@
         // If error, try to delete (possibly erroneous) file 
         if (ferror(File) != 0) {
-          if (remove(Name.c_str()) == -1) Message(WARN, "Error writing history file '%s' in RemoveService(), could also not delete file", Name.c_str());
-          else Message(WARN, "Error writing history file '%s' in RemoveService(), deleted file", Name.c_str());
-        }
-    if (fclose(File) != 0) Message(WARN, "Error closing history file '%s' in RemoveService()", Name.c_str());;
-  }
-
-  Map.erase(Name);
-}
+          if (remove(Name.c_str()) == -1) Message(WARN, "Error writing history file '%s', could also not delete file", Name.c_str());
+          else Message(WARN, "Error writing history file '%s', deleted file", Name.c_str());
+        }
+    if (fclose(File) != 0) Message(WARN, "Error closing history file '%s'", Name.c_str());
+  }
+  else Message(WARN, "Could not open history file '%s' for writing", Name.c_str());;
+}
+
 
 //