Changeset 17915 for fact/Evidence/DColl.cc

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)

File:

• fact/Evidence/DColl.cc (modified) (5 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;
   }