Changeset 151 for Evidence/DColl.cc

Timestamp:

01/18/10 13:10:57 (15 years ago)

Author:

ogrimm

Message:

DColl publishes also current data file name

File:

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

Evidence/DColl.cc

@@ -49 +49 @@
                 
     unsigned int NumItems;
+        char *Filename;
     FILE *DataFile;
     FILE *LogFile;
@@ -54 +55 @@
         int DataSizeLastUpdate, LogSizeLastUpdate;
         char *DataDir;
-    DimService *LogSizeService, *DataSizeService;
+    DimService *LogSizeService, *DataSizeService, *DataFilename;
     int HistSize;
         int SizeUpdateDelay;
@@ -79 +80 @@
 
   // Initialization to prevent freeing unallocated memory 
+  Filename = NULL;
   DataFile = NULL;
   LogFile = NULL;
@@ -105 +107 @@
   LogCommand = new DimCommand("DColl/Log", (char *) "C", this);
               
-  // Create services for file sizes
+  // Create services for file sizes and data file name
   DataSizekB = 0;
   DataSizeService = new DimService(SERVER_NAME "/DataSizekB", DataSizekB);
@@ -111 +113 @@
   LogSizekB = FileSize(LogFile);
   LogSizeService = new DimService(SERVER_NAME "/LogSizekB", LogSizekB);
+
+  DataFilename = new DimService(SERVER_NAME "/CurrentFile", (char *) "");
 
   // Count how many minimum change value regular expressions are present
@@ -162 +166 @@
   free(List);
 
+  delete DataFilename;
   //delete LogSizeService; // These create segmentation faults?!
   //delete DataSizeService;
 
   delete LogCommand;
+  free(Filename);
 
   // Close files
@@ -243 +249 @@
         if (mktime(T) == -1) State(ERROR, "mktime() failed, check filename");
 
-        char *Filename;
+        free(Filename);
         if (MakeString(&Filename, "%s/%d%02d%02d.slow", DataDir, T->tm_year+1900, T->tm_mon+1, T->tm_mday) == -1) State(FATAL, "Could not create filename, MakeString() failed");
         if ((DataFile = fopen(Filename, "a")) == NULL) {
@@ -249 +255 @@
         }
         else State(INFO, "Opened data file '%s'", Filename);
-        free(Filename);
+        DataFilename->updateService(Filename);
         
         // Calculate time for next file opening