Changeset 4a33f6 for src/Actions/FragmentationAction/FragmentationAutomationAction.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/FragmentationAutomationAction.cpp (modified) (3 diffs)

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;