Changeset 4a33f6 for src/Actions/FragmentationAction/AnalyseFragmentationResultsAction.cpp

Timestamp:

May 5, 2016, 5:14:19 PM (10 years ago)

Author:

Frederik Heber <heber@…>

Children:

35e83a

Parents:

8c076a

git-author:

Frederik Heber <heber@…> (05/05/16 13:54:14)

git-committer:

Frederik Heber <heber@…> (05/05/16 17:14:19)

Message:

FragmentationResultContainer when written and inside QtGui is used in locked mode.

File:

• src/Actions/FragmentationAction/AnalyseFragmentationResultsAction.cpp (modified) (2 diffs)

src/Actions/FragmentationAction/AnalyseFragmentationResultsAction.cpp

@@ -560 +560 @@
 
   /// if file is given, parse from file into ResultsContainer
-  FragmentationResultContainer& container = FragmentationResultContainer::getInstance();
-  if (!params.resultsfile.get().empty()) {
-    boost::filesystem::path resultsfile = params.resultsfile.get();
-    if (boost::filesystem::exists(resultsfile)) {
-      LOG(1, "INFO: Parsing results from " << resultsfile.string() << ".");
-      std::ifstream returnstream(resultsfile.string().c_str());
-      if (returnstream.good()) {
-        boost::archive::text_iarchive ia(returnstream);
-        ia >> container;
+  {
+    AtomicInstance<FragmentationResultContainer> container = FragmentationResultContainer::getLockedInstance();
+    if (!params.resultsfile.get().empty()) {
+      boost::filesystem::path resultsfile = params.resultsfile.get();
+      if (boost::filesystem::exists(resultsfile)) {
+        LOG(1, "INFO: Parsing results from " << resultsfile.string() << ".");
+        std::ifstream returnstream(resultsfile.string().c_str());
+        if (returnstream.good()) {
+          boost::archive::text_iarchive ia(returnstream);
+          ia >> *container;
+        }
+      } else {
+        ELOG(1, "Given file" << resultsfile.string() << " does not exist.");
       }
-    } else {
-      ELOG(1, "Given file" << resultsfile.string() << " does not exist.");
-    }
-  }
-
+    }
+  }
   /// get data and keysets from ResultsContainer
+  const FragmentationResultContainer& container = FragmentationResultContainer::getConstInstance();
   const std::map<JobId_t, MPQCData> &shortrangedata = container.getShortRangeResults();
   const KeySetsContainer &keysets = container.getKeySets();
@@ -595 +597 @@
   printReceivedShortResultsPerIndex(shortrangeresults);
   // add summed results to container
-  container.addShortRangeSummedResults(shortrangeresults.getSummedShortRangeResults());
+  {
+    AtomicInstance<FragmentationResultContainer> container = FragmentationResultContainer::getLockedInstance();
+    (*container).addShortRangeSummedResults(shortrangeresults.getSummedShortRangeResults());
+  }
 
   /// now do we need to calculate the cycle contribution