Changeset 11290 for trunk

Timestamp:

07/08/11 09:34:29 (13 years ago)

Author:

lyard

Message:

Moved the files statistics to a separate class and improved transitions

Location:

trunk/FACT++/src

Files:

• FilesStatisticsService.cc (added)
• FilesStatisticsService.h (added)
• Fits.cc (modified) (1 diff)
• datalogger.cc (modified) (23 diffs)

trunk/FACT++/src/Fits.cc

@@ -347 +347 @@
 //          fFile = NULL;
             WriteSingleHeaderKey("TSTOP", fEndMjD, "Time of the last receied data");
-//          fFile->flush();
             delete fFile;
 

trunk/FACT++/src/datalogger.cc

@@ -37 +37 @@
   }
   \enddot
+
+  For questions or bug report, please contact Etienne Lyard (etienne.lyard@unige.ch) or Thomas Bretz.
  */
  //****************************************************************
@@ -67 +69 @@
 #endif
 
+#include "FilesStatisticsService.h"
+
 //Dim structures
 ///Distributes the writing statistics
-struct DataLoggerStats {
-    long sizeWritten;
-    long freeSpace;
-    long writingRate;
-};
+//struct DataLoggerStats {
+//    long sizeWritten;
+//    long freeSpace;
+//    long writingRate;
+//};
 ///distributes the number of opened subscriptions and fits files
 struct NumSubAndFitsType {
@@ -230 +234 @@
     string fFullNightlyReportFileName;
     ///variable to track when the statistic were last calculated
-    Time fPreviousStatsUpdateTime;
+//    Time fPreviousStatsUpdateTime;
     Time fPreviousOldRunNumberCheck;
     ///boolean to know whether we should close and reopen daily files or not
     bool fDailyFileDayChangedAlready;
-
+    FilesStatisticsService fFilesStats;
 private:
     /***************************************************
@@ -269 +273 @@
     ///from NightlyOpen to waiting transition
     int NightlyToWaitRunPlease(); 
+    ///from wait for run number to nightly open
+    int BackToNightlyOpenPlease();
 #ifdef HAVE_FITS
     ///Open fits files
@@ -285 +291 @@
     inline void NotifyOpenedFile(const string &name, int type, DimDescribedService* service);
     ///variables for computing statistics
-    DataLoggerStats fStatVar;
+//    DataLoggerStats fStatVar;
     ///stores the size of each file that is or was open
-    map<string, long> fFileSizesMap;
+//    map<string, long> fFileSizesMap;
     ///total size of the opened files BEFORE they were opened by the logger
-    long fBaseSizeNightly;
-    long fPreviousSize;
-    long fBaseSizeRun;
+//    long fBaseSizeNightly;
+//    long fPreviousSize;
+//    long fBaseSizeRun;
     ///Service for opened files
     DimDescribedService* fOpenedNightlyFiles;
     DimDescribedService* fOpenedRunFiles;
     DimDescribedService* fNumSubAndFits;
-    DimDescribedService* fStatsMonitoring;
+//    DimDescribedService* fStatsMonitoring;
     NumSubAndFitsType fNumSubAndFitsData;
     ///Small function for calculating the total size written so far
-    bool calculateTotalSizeWritten(DataLoggerStats& statVar, bool isPrinting);
+//    bool calculateTotalSizeWritten(DataLoggerStats& statVar, bool isPrinting);
 
     /***************************************************
@@ -362 +368 @@
 //    string CheckIfDirIsDot(const string& dir);
     ///Remembers the size of newly opened files. for statistic purposes
-    bool RememberFileOrigSizePlease(string& fileName, bool nightly);
+//    bool RememberFileOrigSizePlease(string& fileName, bool nightly);
     ///Checks if the input osftream is in error state, and if so close it.
     bool CheckForOfstreamError(ofstream& out, bool isDailyStream);
@@ -371 +377 @@
     bool DoesPathExist(string path);
     ///Check if the statistics service should be updated, and if so, do it
-    void UpdateStatisticsService();
+//    void UpdateStatisticsService();
     ///Check if old run numbers can be trimmed, and if so, do it
     void TrimOldRunNumbers();
@@ -592 +598 @@
 //! @param nightly whether this is a run or nightly file, so that its size is added to the correct member variable
 //
-bool DataLogger::RememberFileOrigSizePlease(string& fileName, bool nightly)
-{
+//bool DataLogger::RememberFileOrigSizePlease(string& fileName, bool nightly)
+//{
     //get the size of the file we're about to open
-    if (fFileSizesMap.find(fileName) != fFileSizesMap.end())
-        return false;
-
-    if (nightly)
-        fBaseSizeNightly += GetFileSize(fileName);
-    else
-        fBaseSizeRun += GetFileSize(fileName);
-    fFileSizesMap[fileName] = 0;
-    return true;
-}
+//    if (fFileSizesMap.find(fileName) != fFileSizesMap.end())
+//        return false;
+
+//    if (nightly)
+//        fBaseSizeNightly += GetFileSize(fileName);
+//    else
+//        fBaseSizeRun += GetFileSize(fileName);
+//    fFileSizesMap[fileName] = 0;
+//    return true;//
+//}
 
 // --------------------------------------------------------------------------
@@ -820 +826 @@
 //! @param isPrinting whether this function was called from the PRINT command or not. If so, displays relevant information
 //
+/*
 bool DataLogger::calculateTotalSizeWritten(DataLoggerStats& statVar, bool isPrinting)
 {
@@ -891 +898 @@
     return shouldWarn;
 }
-
+*/
 // --------------------------------------------------------------------------
 //
@@ -899 +906 @@
 //!Setup the allows states, configs and transitions for the data logger
 //
-DataLogger::DataLogger(ostream &out) : StateMachineDim(out, "DATA_LOGGER")
+DataLogger::DataLogger(ostream &out) : StateMachineDim(out, "DATA_LOGGER"),
+                                       fFilesStats("DATA_LOGGER", this)
 {
     //initialize member data
@@ -935 +943 @@
         ("Transition to exit error states. Closes the any open file.");
 
-    AddEvent(kSM_WaitingRun, "WAIT_FOR_RUN_NUMBER", kSM_NightlyOpen)
+    AddEvent(kSM_WaitingRun, "WAIT_FOR_RUN_NUMBER", kSM_NightlyOpen, kSM_Ready)
         (boost::bind(&DataLogger::NightlyToWaitRunPlease, this))
         ("Go to waiting for run number state. In this state with any received run-number a new file is opened.");
+
+    AddEvent(kSM_NightlyOpen, "BACK_TO_NIGHTLY_OPEN", kSM_WaitingRun)
+    (boost::bind(&DataLogger::BackToNightlyOpenPlease, this))
+    ("Go from the wait for run to nightly open state.");
 
     // Add the possible configurations for this machine
@@ -1015 +1027 @@
 
      //start the monitoring service
-     fStatVar.sizeWritten = 0;
-     fStatVar.freeSpace = 0;
-     fStatVar.writingRate = 0;
-     fPreviousStatsUpdateTime = Time().Mjd();
+//     fStatVar.sizeWritten = 0;
+//     fStatVar.freeSpace = 0;
+//     fStatVar.writingRate = 0;
+//     fPreviousStatsUpdateTime = Time().Mjd();
      fPreviousOldRunNumberCheck = Time().Mjd();
-     fPreviousSize = 0;
-
-     struct statvfs vfs;
-     if (!statvfs(fNightlyFilePath.c_str(), &vfs))
-         fStatVar.freeSpace = vfs.f_bsize*vfs.f_bavail;
-     else
-         fStatVar.freeSpace = -1;
-
-     fStatsMonitoring = new DimDescribedService(GetName() + "/STATS", "X:3", fStatVar, "Add description here");
-
-     fBaseSizeNightly = 0;
-     fBaseSizeRun = 0;
+//     fPreviousSize = 0;
+
+//     struct statvfs vfs;
+//     if (!statvfs(fNightlyFilePath.c_str(), &vfs))
+//         fStatVar.freeSpace = vfs.f_bsize*vfs.f_bavail;
+//     else
+//         fStatVar.freeSpace = -1;
+
+//     fStatsMonitoring = new DimDescribedService(GetName() + "/STATS", "X:3", fStatVar, "Add description here");
+
+//     fBaseSizeNightly = 0;
+//     fBaseSizeRun = 0;
      fDailyFileDayChangedAlready = true;
      fRunNumberTimeout = 60; //default run-timeout set to 1 minute
@@ -1066 +1078 @@
     delete fOpenedRunFiles;
     delete fNumSubAndFits;
-    delete fStatsMonitoring;
+//    delete fStatsMonitoring;
 
     if (fDebugIsOn)
@@ -1077 +1089 @@
 //! checks if the statistic service should be updated, and if so, do it
 //
-void DataLogger::UpdateStatisticsService()
+/*void DataLogger::UpdateStatisticsService()
 {
     //update the fits files sizes
@@ -1104 +1116 @@
         Debug(str);
     }
-}
+}*/
 // --------------------------------------------------------------------------
 //
@@ -1192 +1204 @@
 //    dim_unlock();
     //update the fits files sizes
-    UpdateStatisticsService();
+ //   UpdateStatisticsService();
 
     //remove old run numbers
@@ -1252 +1264 @@
     //get the size of the newly opened file.
 #ifdef RUN_LOGS
-    RememberFileOrigSizePlease(run.logName, false);
+    fFilesStats.FileOpened(run.logName);
+//    RememberFileOrigSizePlease(run.logName, false);
 #endif
-    RememberFileOrigSizePlease(run.reportName, false);
-
+//    RememberFileOrigSizePlease(run.reportName, false);
+    fFilesStats.FileOpened(run.reportName);
     //TODO this notification scheme might be messed up now.... fix it !
     const string baseFileName = CompileFileNameWithPath(fRunFilePath, run.runNumber, "", "");
@@ -1602 +1615 @@
     }
 
-    DataLoggerStats statVar;
-    /*const bool statWarning =*/ calculateTotalSizeWritten(statVar, true);
-
+    FileStatisticsData statVar;
+    fFilesStats.GetTotalSizeWritten(statVar);
+ //   /*const bool statWarning =*/ calculateTotalSizeWritten(statVar, true);
+#ifdef HAVE_FITS
+    str << "There are " << fNumSubAndFitsData.numOpenFits << " FITS files open:";
+    Message(str);
+#else
+    Message("FITS output disabled at compilation");
+#endif
     Message("----------------- STATS ------------------");
     str.str("");
@@ -1930 +1949 @@
     }
     //get the size of the newly opened file.
-    fBaseSizeNightly = GetFileSize(fFullNightlyLogFileName);
-    fBaseSizeNightly += GetFileSize(fFullNightlyReportFileName);
-    fFileSizesMap.clear();
-    fBaseSizeRun = 0;
-    fPreviousSize = 0;
-
+//    fBaseSizeNightly = GetFileSize(fFullNightlyLogFileName);
+//    fBaseSizeNightly += GetFileSize(fFullNightlyReportFileName);
+//    fFileSizesMap.clear();
+//    fBaseSizeRun = 0;
+//    fPreviousSize = 0;
+    fFilesStats.Reset();
+    fFilesStats.FileOpened(fFullNightlyLogFileName);
+    fFilesStats.FileOpened(fFullNightlyReportFileName);
     //notify that a new file has been opened.
     const string baseFileName = CompileFileNameWithPath(fNightlyFilePath, "", "");
@@ -1992 +2013 @@
             AllocateFITSBuffers(sub);
         //get the size of the file we're about to open
-        if (RememberFileOrigSizePlease(partialName, true))//and remember that the file was opened (i.e. not an update)
+        if (fFilesStats.FileOpened(partialName))
+//        if (RememberFileOrigSizePlease(partialName, true))//and remember that the file was opened (i.e. not an update)
             fOpenedNightlyFits[fileNameOnly].push_back(serviceName);
 
@@ -2027 +2049 @@
         }
         //get the size of the file we're about to open
-        if (RememberFileOrigSizePlease(partialName, false))//and remember that the file was opened (i.e. not an update)
+        if (fFilesStats.FileOpened(partialName))
+//        if (RememberFileOrigSizePlease(partialName, false))//and remember that the file was opened (i.e. not an update)
             cRunNumber->openedFits[fileNameOnly].push_back(serviceName);
         else
@@ -2455 +2478 @@
 //
 //! Implements the transition towards kSM_WaitingRun
+//! If current state is kSM_Ready, then tries to go to nightlyOpen state first.
+//!    @returns
+//!        kSM_WaitingRun or kSM_badNightlyConfig
+int DataLogger::NightlyToWaitRunPlease()
+{
+    int cState = GetCurrentState();
+    if (cState == kSM_Ready)
+        cState = StartPlease();
+
+    if (cState != kSM_NightlyOpen)
+        return GetCurrentState();
+
+    if (fDebugIsOn)
+    {
+        Debug("Going to Wait Run Number state...");    
+    }
+    return kSM_WaitingRun;    
+}
+// --------------------------------------------------------------------------
+//
+//! Implements the transition from wait for run number to nightly open
 //! Does nothing really.
 //!    @returns
 //!        kSM_WaitingRun
-int DataLogger::NightlyToWaitRunPlease()
+int DataLogger::BackToNightlyOpenPlease()
 {
     if (fDebugIsOn)
     {
-        Debug("Going to Wait Run Number state...");    
-    }
-    return kSM_WaitingRun;    
+        Debug("Going to NightlyOpen state...");
+    }
+    return kSM_NightlyOpen;
 }
 // --------------------------------------------------------------------------