Merge pull request #41 from kmokstad/mempoll

Optional memory profiling

Author: kmokstad

src/FFlLib/FFlLinkHandler.C

@@ -2250,13 +2250,13 @@ void FFlLinkHandler::countElements() const
 }
 
 
-void FFlLinkHandler::dump() const
+void FFlLinkHandler::dump(const std::string& heading) const
 {
   if (myNumElements.empty())
     this->countElements();
 
-  std::cout <<"\nFFlLinkHandler::dump()"
-            <<"\n   Elements:        "<< myElements.size();
+  std::cout <<"\nFFlLinkHandler::dump("<< heading
+            <<")\n   Elements:        "<< myElements.size();
   for (const ElmTypeCount::value_type& ec : myNumElements)
     std::cout <<"\n\t"<< ec.first <<"\t"<< ec.second;
 

src/FFlLib/FFlLinkHandler.H

@@ -297,7 +297,7 @@ public:
   const Strings& getOP2files() const { return myOP2files; }
   size_t getNumberOfGenDofs() const { return nGenDofs; }
 
-  void dump() const;
+  void dump(const std::string& heading = "") const;
 
 #ifdef FT_USE_CONNECTORS
   int createConnector(const FFaCompoundGeometry& compound,

src/FFlrLib/FFlrFringeCreator.C

@@ -55,24 +55,34 @@ bool FFlrFringeCreator::getColorData(std::vector<double>& colors,
 }
 
 
-void FFlrFringeCreator::deleteColorsXfs(FFlGroupPartData& visRep)
+void FFlrFringeCreator::deleteColorsXfs(FFlGroupPartData& visRep, bool
+#ifdef FT_USE_PROFILER
+                                        memPoll
+#endif
+                                        )
 {
+#ifdef FT_USE_PROFILER
+  size_t oneQuart = visRep.colorOps.size();
+  if (memPoll) oneQuart /= 4;
+#endif
+
   for (size_t i = 0; i < visRep.colorOps.size(); i++)
   {
     if (visRep.colorOps[i])
       visRep.colorOps[i]->unref();
 #ifdef FT_USE_PROFILER
-    if (i == visRep.colorOps.size()/4)
+    if (i == oneQuart)
       FFaMemoryProfiler::reportMemoryUsage("    Kvartveis");
-    if (i == visRep.colorOps.size()/2)
+    else if (i == 2*oneQuart)
       FFaMemoryProfiler::reportMemoryUsage("    Halveis");
-    if (i == 3*visRep.colorOps.size()/4)
+    else if (i == 3*oneQuart)
       FFaMemoryProfiler::reportMemoryUsage("    Trekvartveis");
 #endif
   }
 
 #ifdef FT_USE_PROFILER
-  FFaMemoryProfiler::reportMemoryUsage("    Helveis");
+  if (memPoll)
+    FFaMemoryProfiler::reportMemoryUsage("    Helveis");
 #endif
 
   FFlrOperations empty;

src/FFlrLib/FFlrFringeCreator.H

@@ -21,7 +21,7 @@ namespace FFlrFringeCreator
   bool getColorData(std::vector<double>& colors,
                     const FFlGroupPartData& visRep, bool isPrFace);
 
-  void deleteColorsXfs(FFlGroupPartData& visRep);
+  void deleteColorsXfs(FFlGroupPartData& visRep, bool memPoll = false);
 
   int buildColorXfs(FFlGroupPartData& visRep,
                     FFlLinkHandler* lh, const FapFringeSetup& setup);

src/FFrLib/FFrExtractor.C

@@ -90,7 +90,7 @@ void FFrExtractor::releaseMemoryBlocks(bool readOps)
 */
 
 bool FFrExtractor::addFiles(const std::set<std::string>& fileNames,
-                            bool showProgress)
+                            bool showProgress, bool doMemPoll)
 {
   if (fileNames.empty()) return true;
 
@@ -99,7 +99,7 @@ bool FFrExtractor::addFiles(const std::set<std::string>& fileNames,
   for (const std::string& fileName : fileNames)
     fileVec.push_back(fileName);
 
-  return this->addFiles(fileVec,showProgress);
+  return this->addFiles(fileVec,showProgress,false,doMemPoll);
 }
 
 
@@ -109,7 +109,7 @@ bool FFrExtractor::addFiles(const std::set<std::string>& fileNames,
 */
 
 bool FFrExtractor::addFiles(const std::vector<std::string>& fileNames,
-			    bool showProgress, bool mustExist)
+			    bool showProgress, bool mustExist, bool doMemPoll)
 {
 #if FFR_DEBUG > 1
   std::cout <<"FFrExtractor::addFiles()"<< std::endl;
@@ -128,7 +128,7 @@ bool FFrExtractor::addFiles(const std::vector<std::string>& fileNames,
       FFaMsg::setSubTask(FFaFilePath::getFileName(fileName));
       FFaMsg::setSubStep(++subStep);
     }
-    if (!this->addFile(fileName,mustExist))
+    if (!this->addFile(fileName,mustExist,doMemPoll))
       retval = false;
   }
 
@@ -166,7 +166,8 @@ FFrResultContainer* FFrExtractor::getResultContainer(const std::string& fileName
 }
 
 
-bool FFrExtractor::addFile(const std::string& fileName, bool mustExist)
+bool FFrExtractor::addFile(const std::string& fileName,
+                           bool mustExist, bool doMemPoll)
 {
 #if FFR_DEBUG > 1
   std::cout <<"FFrExtractor::addFile()\n\tfilename: "<< fileName << std::endl;
@@ -177,9 +178,9 @@ bool FFrExtractor::addFile(const std::string& fileName, bool mustExist)
   if (container) return true;
 
   // Create a new result container for the given results file.
-  // The header section of if is then parsed if the file is a valid.
+  // The header section of it is then parsed if the file is a valid.
   container = new FFrResultContainer(this,fileName);
-  switch (this->doSingleResultFileUpdate(container)) {
+  switch (this->doResultFileUpdate(container,doMemPoll)) {
   case FFrResultContainer::FFR_CONTAINER_INVALID:
     FFaMsg::list("   * Note: Ignoring invalid results database file:\n");
     break;
@@ -201,7 +202,11 @@ bool FFrExtractor::addFile(const std::string& fileName, bool mustExist)
 }
 
 
-bool FFrExtractor::updateExtractorHeader(FFrResultContainer* container)
+bool FFrExtractor::updateExtractorHeader(FFrResultContainer* container, bool
+#ifdef FT_USE_PROFILER
+                                         doMemPoll
+#endif
+                                         )
 {
 #if FFR_DEBUG > 1
   std::cout <<"FFrExtractor::updateExtractorHeader()\n\tfilename: "
@@ -210,9 +215,10 @@ bool FFrExtractor::updateExtractorHeader(FFrResultContainer* container)
   if (!container->isHeaderComplete()) return false;
 
 #ifdef FT_USE_PROFILER
-  FFaProfiler timer("ExtractorTimer");
+  FFaProfiler timer("ExtractorTimer: " + container->getFileName());
   timer.startTimer("updateExtractorHeader");
-  FFaMemoryProfiler::reportMemoryUsage("> updateExtractorHeader");
+  if (doMemPoll)
+    FFaMemoryProfiler::reportMemoryUsage("> updateExtractorHeader");
 #endif
 
   for (FFrEntryBase* entry : container->topLevel())
@@ -283,7 +289,8 @@ bool FFrExtractor::updateExtractorHeader(FFrResultContainer* container)
 #endif
 
 #ifdef FT_USE_PROFILER
-  FFaMemoryProfiler::reportMemoryUsage("  updateExtractorHeader >");
+  if (doMemPoll)
+    FFaMemoryProfiler::reportMemoryUsage("  updateExtractorHeader >");
   timer.stopTimer("updateExtractorHeader");
   timer.report();
 #endif
@@ -523,27 +530,28 @@ FFrEntryBase* FFrExtractor::findVar(const std::string& oType, int baseId,
 }
 
 
-void FFrExtractor::doResultFilesUpdate()
+void FFrExtractor::doResultFilesUpdate(bool doMemPoll)
 {
   for (const ContainerMap::value_type& c : myContainers)
-    this->doSingleResultFileUpdate(c.second);
+    this->doResultFileUpdate(c.second,doMemPoll);
 }
 
 
-int FFrExtractor::doSingleResultFileUpdate(FFrResultContainer* container)
+int FFrExtractor::doResultFileUpdate(FFrResultContainer* container,
+                                     bool doMemPoll)
 {
 #if FFR_DEBUG > 2
-  std::cout <<"FFrExtractor::doSingleResultFileUpdate()\n\tfilename: "
+  std::cout <<"FFrExtractor::doResultFileUpdate()\n\tfilename: "
 	    << container->getFileName() << std::endl;
 #endif
 
   if (container->getContainerStatus() == FFrResultContainer::FFR_DATA_CLOSED)
     return FFrResultContainer::FFR_DATA_CLOSED;
 
   bool wasComplete = container->isHeaderComplete();
-  int status = container->updateContainerStatus();
+  int status = container->updateStatus(doMemPoll);
   if (!wasComplete && container->isHeaderComplete())
-    this->updateExtractorHeader(container);
+    this->updateExtractorHeader(container,doMemPoll);
 
   return status;
 }

src/FFrLib/FFrExtractor.H

@@ -57,12 +57,14 @@ public:
 
   //! \brief Adds a set of files to the RDB.
   bool addFiles(const std::set<std::string>& fileNames,
-                bool showProgress = false);
+                bool showProgress = false, bool doMemPoll = false);
   //! \brief Adds a list of files to the RDB.
   virtual bool addFiles(const std::vector<std::string>& fileNames,
-                        bool showProgress = false, bool mustExist = false);
+                        bool showProgress = false, bool mustExist = false,
+                        bool doMemPoll = false);
   //! \brief Adds a single file to the RDB.
-  bool addFile(const std::string& fileName, bool mustExist = false);
+  bool addFile(const std::string& fileName, bool mustExist = false,
+               bool doMemPoll = false);
 
   //! \brief Closes all result container files.
   void closeFiles();
@@ -77,7 +79,7 @@ public:
   virtual bool removeFiles(const std::set<std::string>& fileNames);
 
   //! \brief Checks if there is new data on disk.
-  virtual void doResultFilesUpdate();
+  virtual void doResultFilesUpdate(bool doMemPoll = true);
 
   //! \brief Returns a pointer to the variables container of this extractor.
   VariableSet*  getVariables()  { return &myVariables; }
@@ -165,9 +167,9 @@ public:
 
 protected:
   //! \brief Checks if there is new data on disk for the given \a container.
-  virtual int doSingleResultFileUpdate(FFrResultContainer* container);
+  virtual int doResultFileUpdate(FFrResultContainer* container, bool memPoll);
   //! \brief Updates the top-level containers with items from \a container.
-  bool updateExtractorHeader(FFrResultContainer* container);
+  bool updateExtractorHeader(FFrResultContainer* container, bool memPoll);
 
 private:
   std::string myName;       //!< Name of this extractor
@@ -177,7 +179,7 @@ private:
   std::set<std::string> myDict;
 
   //! File name to result container mapping
-  typedef std::map<std::string,FFrResultContainer*> ContainerMap;
+  using ContainerMap = std::map<std::string,FFrResultContainer*>;
 
   ContainerMap myContainers; //!< All result containers in this extractor
   VariableSet  myVariables;  //!< All variables in this extractor

src/FFrLib/FFrExtractor_F.C

@@ -64,13 +64,13 @@ SUBROUTINE(ffr_init,FFR_INIT) (const char* file,
     {
       for (std::string& file : files)
         ListUI <<"\n   * Reading results file "<< FFaFilePath::checkName(file);
-      ierr = ourRdb->addFiles(files,false,true) ? 0 : 1;
+      ierr = ourRdb->addFiles(files,false,true,true) ? 0 : 1;
     }
   }
   else
   {
     ListUI <<"\n   * Reading results file "<< FFaFilePath::checkName(fnames);
-    ierr = ourRdb->addFile(fnames,true) ? 0 : 1;
+    ierr = ourRdb->addFile(fnames,true,true) ? 0 : 1;
   }
   ListUI <<"\n\n";
 }