Changeset 10968 for trunk

Timestamp:

06/09/11 23:31:28 (13 years ago)

Author:

tbretz

Message:

Added some const-qualifiers and did a few minor changes to the layout of the code.

File:

• trunk/FACT++/src/dataLogger.cc (modified) (23 diffs)

trunk/FACT++/src/dataLogger.cc

@@ -416 +416 @@
     if (path[path.size()-1] == '/')
         path = path.substr(0, path.size()-1);
+
     //create boost path
-    boost::filesystem::path fullPath =  boost::filesystem::system_complete(boost::filesystem::path(path));
+    const boost::filesystem::path fullPath =  boost::filesystem::system_complete(boost::filesystem::path(path));
 
     //if path does not exist, check if upper levels exist already
-    if (!boost::filesystem::exists(fullPath))
-    {
-        if (path.size() <= 1)
-        {//we're hitting "/", which SHOULD have existed...
-            Error("Something unexpected happened while creating a path");
-        }
-        CreateDirectory(path.substr(0, path.find_last_of('/')));
-    }
-    else
-    {//if path already exist, make sure it does not designate a file (filenames cannot be checked if they do not exist)
-        if (!boost::filesystem::is_directory(fullPath))
-        {
-            Error("Path to be created contains a file name: '" + path + "'");
-            return false;
-        }
-
-        return true;
-    }
+    if (boost::filesystem::exists(fullPath))
+    {
+        //if path already exist, make sure it does not designate a file (filenames cannot be checked if they do not exist)
+        if (boost::filesystem::is_directory(fullPath))
+            return true;
+
+        Error("Path to be created contains a file name: '" + path + "'");
+        return false;
+    }
+
+    if (path.size() <= 1)
+    {//we're hitting "/", which SHOULD have existed...
+        Error("Something unexpected happened while creating a path");
+    }
+    CreateDirectory(path.substr(0, path.find_last_of('/')));
+
     //path does not exist, and upper level have been created already by recusrion.
-    mode_t rightsMask = S_IRWXU | S_IXGRP | S_IRGRP | S_IXOTH | S_IROTH; //everybody read, owner writes
-
-    int returnValue = mkdir(path.c_str(), rightsMask);
+    const mode_t rightsMask = S_IRWXU | S_IXGRP | S_IRGRP | S_IXOTH | S_IROTH; //everybody read, owner writes
+
+    const int returnValue = mkdir(path.c_str(), rightsMask);
 
     if (returnValue != 0)
@@ -461 +460 @@
 bool DataLogger::DoesPathExist(string path)
 {
-    boost::filesystem::path fullPath = boost::filesystem::system_complete(boost::filesystem::path(path));
-
+    const boost::filesystem::path fullPath = boost::filesystem::system_complete(boost::filesystem::path(path));
 
     if (!boost::filesystem::exists(fullPath))
@@ -596 +594 @@
     errno = 0;
     stream.open(name.c_str(), ios_base::out | ios_base::app);
-    if (errno != 0)
+    if (!stream)
     {
         ostringstream str;
-        str << "Unable to open file: " << name << ". Reason: " << strerror(errno) << " [" << errno << "]";
+        str << "Open file " << name << ": " << strerror(errno) << " (errno=" << errno << ")";
         Error(str);
     }
@@ -793 +791 @@
             if (y->second.runFile.IsOpen())
             {
-                    fFileSizesMap[y->second.runFile.fFileName] = y->second.runFile.GetWrittenSize();
-                    if (isPrinting)
-                        Message("-> "+y->second.runFile.fFileName);
+                fFileSizesMap[y->second.runFile.fFileName] = y->second.runFile.GetWrittenSize();
+                if (isPrinting)
+                    Message("-> "+y->second.runFile.fFileName);
             }
             if (y->second.nightlyFile.IsOpen())
@@ -848 +846 @@
     return shouldWarn;
 }
+
 //static members initialization
 //since I do not check the transition/config names any longer, indeed maybe these could be hard-coded... but who knows what will happen in the future ?
@@ -1130 +1129 @@
 
     //update the fits files sizes
-    Time cTime = Time();
+    const Time cTime = Time();
     if ((fStatsPeriodDuration != 0) && ((cTime.Mjd() - fPreviousStatsUpdateTime)*24*60*60 > fStatsPeriodDuration))
     {
@@ -1163 +1162 @@
     }
     run.logName = CompileFileName(fRunFilePath, run.runNumber, "", "log");
+
     errno = 0;
     run.logFile->open(run.logName.c_str(), ios_base::out | ios_base::app);
@@ -1168 +1168 @@
     {
         ostringstream str;
-        str << "Unable to open run Log " << run.logName << ". Reason: " << strerror(errno) << " [" << errno << "]";
+        str << "Unable to open log-file " << run.logName << ": " << strerror(errno) << " (errno=" << errno << ")";
         Error(str);
     }
@@ -1181 +1181 @@
         return -1;
     }
+
     errno = 0;
     run.reportFile->open(run.reportName.c_str(), ios_base::out | ios_base::app);
@@ -1186 +1187 @@
     {
         ostringstream str;
-        str << "Unable to open run report " << run.reportName << ". Reason: " << strerror(errno) << " [" << errno << "]";
+        str << "Unable to open rep-file " << run.reportName << ": " << strerror(errno) << " (errno=" << errno << ")";
         Error(str);
     }
@@ -1212 +1213 @@
 
     //TODO this notification scheme might be messed up now.... fix it !
-    string baseFileName = CompileFileName(fRunFilePath, run.runNumber, "", "");
+    const string baseFileName = CompileFileName(fRunFilePath, run.runNumber, "", "");
     NotifyOpenedFile(baseFileName, 3, fOpenedRunFiles);
     run.openedFits.clear();
@@ -1653 +1654 @@
 int DataLogger::SetNumSubsAndFitsOnOff(const Event& evt)
 {
-    bool backupSubs = fNumSubAndFitsIsOn;
+    const bool backupSubs = fNumSubAndFitsIsOn;
     fNumSubAndFitsIsOn = evt.GetBool();
+
     if (fNumSubAndFitsIsOn == backupSubs)
         Warn("Warning: Number of subscriptions service mode was already in the requested state");
@@ -1700 +1702 @@
 int DataLogger::ConfigureRunFileName(const Event& evt)
 {
-    if (evt.GetText() != NULL)
-    {
-        string givenPath = string(evt.GetText());
-        if (!DoesPathExist(givenPath))
-        {
-            Error("Provided path is not a valid folder. Ignored");
-            return GetCurrentState();
-        }
-        fRunFilePath = givenPath;
-        Message("New Run folder specified: " + fRunFilePath);
-    }
-    else
+    if (evt.GetText() == NULL)
+    {
         Error("Empty Nightly folder given. Please specify a valid path");
+        return GetCurrentState();
+    }
+
+    const string givenPath = string(evt.GetText());
+    if (!DoesPathExist(givenPath))
+    {
+        Error("Provided path is not a valid folder. Ignored");
+        return GetCurrentState();
+    }
+
+    fRunFilePath = givenPath;
+    Message("New Run folder specified: " + fRunFilePath);
 
     return GetCurrentState();
@@ -1798 +1802 @@
 
     //notify that a new file has been opened.
-    string baseFileName = CompileFileName(fNightlyFilePath, "", "");
+    const string baseFileName = CompileFileName(fNightlyFilePath, "", "");
     NotifyOpenedFile(baseFileName, 3, fOpenedNightlyFiles);
 
@@ -1815 +1819 @@
 {
     string serviceName(sub.dimInfo->getName());
+
     //if run number has changed, reopen a new fits file with the correct run number.
      if (sub.runFile.IsOpen() && sub.runFile.fRunNumber != sub.runNumber)
@@ -1822 +1827 @@
          sub.runFile.Close();
      }
-      //we must check if we should group this service subscription to a single fits file before we replace the / by _
+
+     //we must check if we should group this service subscription to a single fits file before we replace the / by _
     bool hasGrouping = false;
     if (!sub.runFile.IsOpen() && (GetCurrentState() == kSM_Logging))
@@ -1847 +1853 @@
     if (!sub.nightlyFile.IsOpen())
     {
-        string fileNameOnly, partialName;
-        partialName = CompileFileName(fNightlyFilePath, serviceName, "fits");
-        fileNameOnly = partialName.substr(partialName.find_last_of('/')+1, partialName.size());
+        string partialName = CompileFileName(fNightlyFilePath, serviceName, "fits");
+
+        const string fileNameOnly = partialName.substr(partialName.find_last_of('/')+1, partialName.size());
         if (!sub.fitsBufferAllocated)
             AllocateFITSBuffers(sub);
@@ -1862 +1868 @@
         }
         //notify the opening
-        string baseFileName = CompileFileName(fNightlyFilePath, "", "");
+        const string baseFileName = CompileFileName(fNightlyFilePath, "", "");
         NotifyOpenedFile(baseFileName, 7, fOpenedNightlyFiles);
         if (fNumSubAndFitsIsOn)
@@ -1911 +1917 @@
             }
 
-        string baseFileName = CompileFileName(fRunFilePath, sub.runNumber, "", "");
+        const string baseFileName = CompileFileName(fRunFilePath, sub.runNumber, "", "");
         NotifyOpenedFile(baseFileName, 7, fOpenedRunFiles);// + '_' + serviceName, 4);
         if (hasGrouping)
@@ -1946 +1952 @@
 void DataLogger::AllocateFITSBuffers(SubscriptionType& sub)
 {
-    int size = sub.dimInfo->getSize();
-     
     //Init the time columns of the file
     Description dateDesc(string("Time"), string("Modified Julian Date"), string("MjD"));
@@ -1967 +1971 @@
     //we've got a nice structure describing the format of this service's messages.
     //Let's create the appropriate FITS columns
+    int size = sub.dimInfo->getSize();
+
     vector<string> dataFormatsLocal;
     for (unsigned int i=0;i<flist.size()-1;i++)
@@ -2003 +2009 @@
              break;
              case 'S':
+                 size--;
                  //for strings, the number of elements I get is wrong. Correct it
                  dataQualifier.str(""); //clear
-                 dataQualifier << size-1 <<  "A";
-                 size = size-1;
+                 dataQualifier << size <<  "A";
              break;
              
@@ -2032 +2038 @@
                 SetCurrentState(kSM_WriteError);
          }
+
         if (sub.runFile.IsOpen())
         {