Changeset 151 for Evidence

Timestamp:

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

Author:

ogrimm

Message:

DColl publishes also current data file name

Location:

Evidence

Files:

• Config.cc (modified) (1 diff)
• DColl.cc (modified) (8 diffs)
• Edd/Edd.cc (modified) (1 diff)
• readme.txt (added)

Evidence/Config.cc

@@ -16 +16 @@
 \********************************************************************/
 
-#define DEFAULT_CONFIG "../../config/Evidence.conf"
+#define DEFAULT_CONFIG "../config/Evidence.conf"
 #define SERVER_NAME "Config"
 

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

Evidence/Edd/Edd.cc

@@ -597 +597 @@
   MainLayout = new QGridLayout(MainWidget);
 
+  Value = new Edd_Indicator("Alarm/Status");
+  Value->setMaximumWidth(200);
+  MainLayout->addWidget(Value, 0, 0, 1, 2);      
+
+  Value = new Edd_Indicator("Alarm/MasterAlarm");
+  MainLayout->addWidget(Value, 0, 1, 1, 1);
+
+  Textout = new Edd_Textout("Alarm/Summary");
+  Textout->Accumulate = false;
+  Textout->setMaximumWidth(200);
+  Textout->setMaximumHeight(150);
+  MainLayout->addWidget(Textout, 1, 0, 1, 2);
+
+  Value = new Edd_Indicator("DColl/Status");
+  Value->setMaximumWidth(200);
+  MainLayout->addWidget(Value, 3, 0, 1, 2);      
+
   Value = new Edd_Indicator("DColl/DataSizekB");
-  MainLayout->addWidget(Value, 3, 5, 1, 1);
+  MainLayout->addWidget(Value, 4, 0, 1, 1);
 
   Value = new Edd_Indicator("DColl/LogSizekB");
-  MainLayout->addWidget(Value, 4, 5, 1, 1);
+  MainLayout->addWidget(Value, 4, 1, 1, 1);
+
+  Value = new Edd_Indicator("DColl/CurrentFile");
+  Value->setMaximumWidth(400);
+  MainLayout->addWidget(Value, 5, 0, 1, 3);
+
+  Value = new Edd_Indicator("Config/Status");
+  Value->setMaximumWidth(200);
+  MainLayout->addWidget(Value, 6, 0, 1, 2);      
 
   Value = new Edd_Indicator("Config/ModifyTime");
   Value->setMaximumWidth(200);
   Value->ShowAsTime = true;
-  MainLayout->addWidget(Value, 5, 5, 1, 1);
-
-  Value = new Edd_Indicator("Alarm/MasterAlarm");
-  MainLayout->addWidget(Value, 2, 0, 1, 1);
-
-  Textout = new Edd_Textout("Alarm/Summary");
-  Textout->Accumulate = false;
-  MainLayout->addWidget(Textout, 3, 0, 2, 1);
+  MainLayout->addWidget(Value, 7, 0, 1, 1);
+
 
   // Layout of all widgets