Changeset 4a33f6

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.

Location:

src

Files:

• Actions/FragmentationAction/AnalyseFragmentationResultsAction.cpp (modified) (2 diffs)
• Actions/FragmentationAction/ClearFragmentationResultsAction.cpp (modified) (1 diff)
• Actions/FragmentationAction/FragmentationAction.cpp (modified) (1 diff)
• Actions/FragmentationAction/FragmentationAutomationAction.cpp (modified) (3 diffs)
• UIElements/Views/Qt4/QtFragmentList.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

src/Actions/FragmentationAction/ClearFragmentationResultsAction.cpp

@@ -51 +51 @@
 ActionState::ptr FragmentationClearFragmentationResultsAction::performCall() {
 
-  FragmentationResultContainer::getInstance().clear();
+  {
+    AtomicInstance<FragmentationResultContainer> container = FragmentationResultContainer::getLockedInstance();
+    (*container).clear();
+  }
 
-  if (FragmentationResultContainer::getInstance().getShortRangeResults().empty()) {
+  if (FragmentationResultContainer::getConstInstance().getShortRangeResults().empty()) {
     LOG(1, "STATUS: Fragmentation results cleared.");
     return Action::success;

src/Actions/FragmentationAction/FragmentationAction.cpp

@@ -220 +220 @@
         cyclekeys.insert(temp_cycle, order);
       }
-      FragmentationResultContainer::getInstance().addCycles(cyclekeys);
+      {
+        AtomicInstance<FragmentationResultContainer> container = FragmentationResultContainer::getLockedInstance();
+         (*container). addCycles(cyclekeys);
+      }
     }
     // Create graph and insert into TotalGraph

src/Actions/FragmentationAction/FragmentationAutomationAction.cpp

@@ -119 +119 @@
   // TODO: Have io_service run in second thread and merge with current again eventually
 
-  FragmentationResultContainer &container =
-      FragmentationResultContainer::getInstance();
   const KeySetsContainer& keysets = FragmentJobQueue::getInstance().getKeySets();
   const KeySetsContainer& forcekeysets = FragmentJobQueue::getInstance().getFullKeySets();
@@ -343 +341 @@
     }
   }
-  container.addFullResults(keysets, forcekeysets, shortrangedata, longrangedata);
+  {
+    AtomicInstance<FragmentationResultContainer> container =
+        FragmentationResultContainer::getLockedInstance();
+    (*container).addFullResults(keysets, forcekeysets, shortrangedata, longrangedata);
+  }
   } else {
-    container.addShortRangeResults(keysets, forcekeysets, shortrangedata);
+    AtomicInstance<FragmentationResultContainer> container =
+        FragmentationResultContainer::getLockedInstance();
+    (*container).addShortRangeResults(keysets, forcekeysets, shortrangedata);
   }
 #else
-  container.addShortRangeResults(keysets, forcekeysets, shortrangedata);
+  {
+    AtomicInstance<FragmentationResultContainer> container =
+        FragmentationResultContainer::getLockedInstance();
+    (*container).addShortRangeResults(keysets, forcekeysets, shortrangedata);
+  }
 #endif
 
@@ -359 +367 @@
     std::ofstream returnstream(resultsfile.string().c_str());
     if (returnstream.good()) {
+      const FragmentationResultContainer& container =
+          FragmentationResultContainer::getConstInstance();
       boost::archive::text_oarchive oa(returnstream);
       oa << container;

src/UIElements/Views/Qt4/QtFragmentList.cpp

@@ -101 +101 @@
 {
   clearing = true;
-  FragmentationResultContainer &fragments =
-      FragmentationResultContainer::getInstance();
+
+  const AtomicInstance<FragmentationResultContainer> fragments =
+      FragmentationResultContainer::getLockedInstance();
 
   // clear everything
@@ -110 +111 @@
 
   size_t count = 0;
-  const IndexSetContainer keysets(fragments.getKeySets());
-  const FragmentationResultContainer::shortrangedata_t &shortrange = fragments.getShortRangeResults();
-  const FragmentationShortRangeResults::summedshortrange_t &summedshortrange = fragments.getShortRangeSummedResults();
+  const IndexSetContainer keysets((*fragments).getKeySets());
+  const FragmentationResultContainer::shortrangedata_t &shortrange = (*fragments).getShortRangeResults();
+  const FragmentationShortRangeResults::summedshortrange_t &summedshortrange = (*fragments).getShortRangeSummedResults();
   IndexSetContainer::Container_t::const_iterator keyiter = keysets.getContainer().begin();
   FragmentationResultContainer::shortrangedata_t::const_iterator resultiter = shortrange.begin();