Changeset 11291

Timestamp:

07/08/11 09:49:52 (13 years ago)

Author:

lyard

Message:

Little changes and cosmetics with statistics service

Location:

trunk/FACT++/src

Files:

• FilesStatisticsService.cc (modified) (2 diffs)
• FilesStatisticsService.h (modified) (1 diff)
• datalogger.cc (modified) (4 diffs)

trunk/FACT++/src/FilesStatisticsService.cc

@@ -20 +20 @@
                                                                                              fCurrentFolder("."),
                                                                                              fContinueStats(true),
+                                                                                             fDebug(false),
                                                                                              fBaseSize(0),
                                                                                              fPeriodDuration(1),
@@ -80 +81 @@
 //! @param folder the path to the folder
 //
-bool FilesStatisticsService::SetCurrentFolder(string& folder)
+bool FilesStatisticsService::SetCurrentFolder(const string& folder)
 {
     fMutex.lock();

trunk/FACT++/src/FilesStatisticsService.h

@@ -25 +25 @@
 {
 private:
+    ///The name of the server which created the object
     string fServerName;
+    ///The current folder being watched for free space
     string fCurrentFolder;
+    ///The boost thread used to update the service
     boost::thread fThread;
+    ///The data structure holding the stat data
     FileStatisticsData fStats;
+    ///The mutex used to make sure that the service isn't updated while changing conf.
     mutex fMutex;
+    ///the Dim service
     DimDescribedService* fService;
+    ///Bool indicating if main loop should be exited
     bool fContinueStats;
+    ///Bool indicating if debug information should be printed
     bool fDebug;
+    ///Main loop
     void UpdateService();
+    ///Returns the free space on the disk of the folder being watched (fCurrentFolder)
     long GetFreeSpace();
+    ///Returns the size on disk of a given file
     long GetFileSizeOnDisk(const string& file);
+    ///This is the total base size of all opened files
     long fBaseSize;
+    ///This is the list of all opened files. set is used to easily check for entries
     set<string> fOpenedFiles;
+    ///This is the duration, in second between two service updates. 0 means no more updates
     float fPeriodDuration;
+    ///This is the MessageImp object used for messaging
     MessageImp* fMess;
 public:
-    ///Default constructor
-//    FilesStatisticsService();
+    ///Constructor
     FilesStatisticsService(const string& serverName, MessageImp* mess);
     ///Default destructor
     ~FilesStatisticsService();
     ///Configures that current folder where files are written to
-    bool SetCurrentFolder(string& folder);
+    bool SetCurrentFolder(const string& folder);
     bool FileOpened(const string& fileName);
     void SetDebugMode(bool);

trunk/FACT++/src/datalogger.cc

@@ -1696 +1696 @@
     Message(str);
 
+    fFilesStats.SetDebugMode(fDebugIsOn);
+
     return GetCurrentState();
 }
@@ -1708 +1710 @@
 int DataLogger::SetStatsPeriod(const Event& evt)
 {
-    const float backupDuration = fStatsPeriodDuration;
+/*    const float backupDuration = fStatsPeriodDuration;
 
     fStatsPeriodDuration = evt.GetFloat();
@@ -1735 +1737 @@
         Message(str);
     }
-
+*/
+    fFilesStats.SetStatPeriod(evt.GetFloat());
     return GetCurrentState();
 }
@@ -1845 +1848 @@
 
     target = givenPath;
+
+    fFilesStats.SetCurrentFolder(givenPath);
 
     return GetCurrentState();