Changeset 17915

Timestamp:

07/18/14 10:08:12 (10 years ago)

Author:

ogrimm

Message:

Removed erroneous static declaration in History.cc that made a variable grow in size indefinitely. The data collector has new a service indicating its subscriptions (as the history server)

Location:

fact/Evidence

Files:

• DColl.cc (modified) (5 diffs)
• History.cc (modified) (10 diffs)

fact/Evidence/DColl.cc

@@ -45 +45 @@
         float DataSizeMB, LogSizeMB;
         int DataSizeLastUpdate, LogSizeLastUpdate;
-    DimService *LogSizeService, *DataSizeService, *DataFilename;
+    DimService *LogSizeService, *DataSizeService, *DataFilename, *SubscriptionService;
+
         int TimeForNextFile;
 
@@ -113 +114 @@
   LogCommand = new DimCommand("DColl/Log", (char *) "C", this);
 
-  // Subsribe to top-level server list (not via AddService() due to thread issue)
+  // Create services for information about subscribed services
+  SubscriptionService = new DimService(SERVER_NAME "/Subscriptions", "C", NULL, 0);
+
+  // Subscribe to top-level server list (not via AddService() due to thread issue)
   ServerList = new DimInfo((char *) "DIS_DNS/SERVER_LIST", NO_LINK, this);
 }
@@ -132 +136 @@
   delete LogSizeService;
   delete DataSizeService;
+  delete SubscriptionService;
 
   // Close files
@@ -151 +156 @@
 // no mutex is needed to serialize writing to the file
 void DataHandler::infoHandler() {
+
+  static string SubscriptionList;
 
   // Check if service available
@@ -192 +199 @@
           Name = strtok(NULL, "|");
         }
+        
+        // Update service subscription list
+        stringstream Stream;
+        
+        for (unsigned int i=0; i<List.size(); i++) Stream << List[i].DataItem->getName() << '|';
+
+        SubscriptionList = Stream.str();
+        SubscriptionService->updateService((void *) SubscriptionList.c_str(), SubscriptionList.size()+1); // Note that Subscription is a static variable
+
         return;
   }

fact/Evidence/History.cc

@@ -29 +29 @@
 using namespace std;
 
-const int MIN_SIZE_KB = 50;                                     // Min and max buffersize in kByte (> 3*sizeof(int) !)
-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
-
 //
 // Class declaration
@@ -39 +34 @@
 class History:  public DimRpc, public DimClient, public EvidenceServer {
 
+        static const int MIN_SIZE_KB = 50;                                      // Min and max buffersize in kByte (> 3*sizeof(int) !)
+        static const string DEFAULT_MAX_SIZE_KB;
+        static const string DEFAULT_NUM_ENTRIES;                                // Number of entries in each history buffer
+ 
         struct Item {
           DimStampedInfo *DataItem;
@@ -52 +51 @@
         
         DimInfo *ServerList;
-        DimService *Service;
+        DimService *SubscriptionService;
         char *Directory;
 
@@ -68 +67 @@
 }; 
 
+// Initialize non-integral constants (cannot be inside class declaration)
+const string History::DEFAULT_MAX_SIZE_KB = "2000";
+const string History::DEFAULT_NUM_ENTRIES = "1000";
+static const double MIN_SAVE_PERIOD = 0.5;                      // Minimum period between saving history buffers in hours
+
 
 // Constructor
@@ -73 +77 @@
                                                          EvidenceServer(SERVER_NAME),
                                                          Directory(Dir) {
+
   // Get/initialize configuration
   GetConfig("minchange", " ");
@@ -81 +86 @@
 
   // Create services for information about subscribed services
-  Service = new DimService(SERVER_NAME "/Subscriptions", "C", NULL, 0);
+  SubscriptionService = new DimService(SERVER_NAME "/Subscriptions", "C", NULL, 0);
 
   // Subscribe to top-level server list
@@ -94 +99 @@
   while (Map.size() != 0) RemoveService((*Map.begin()).first);
   
-  delete Service;
+  delete SubscriptionService;
 }
 
@@ -147 +152 @@
         
         // Update service subscription list
-        static stringstream Stream;
+        stringstream Stream;
         
         for (map<string, struct Item>::const_iterator i=Map.begin(); i!=Map.end(); i++) {
@@ -153 +158 @@
         }
         List = Stream.str();
-        Service->updateService((void *) List.c_str(), List.size()+1);
+        SubscriptionService->updateService((void *) List.c_str(), List.size()+1); // Note that List is a static variable
         
         return;
@@ -166 +171 @@
 
   // 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) {
+  if (time(NULL)-Map[Service].LastSave > max(atof(GetConfig("saveperiod").c_str()), MIN_SAVE_PERIOD)*3600) {
     Map[Service].LastSave = time(NULL);
         SaveHistory(Service);