Refs #5021: attempt to split MDBoxes on addEvent()

segfaults sometimes...

Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDBox.h

@@ -128,6 +128,10 @@ namespace MDEvents
     size_t getEventVectorSize() const
     { return data.size(); }
 
+    /// @return the mutex for modifying the data vector
+    Mantid::Kernel::Mutex & getDataMutex()
+    { return dataMutex; }
+
     /// @return true if events were added to the box (using addEvent()) while the rest of the event list is cached to disk
     bool getHasAddedEventsOnCached() const
     { return (!m_inMemory && (data.size() != 0)); }

Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDGridBox.h

@@ -153,8 +153,8 @@ namespace MDEvents
     /// Cached number of points contained (including all sub-boxes)
     size_t nPoints;
 
-    /// Mutex for counting points and total signal
-    Mantid::Kernel::Mutex statsMutex;
+    /// Mutex for calls to splitContents()
+    Mantid::Kernel::Mutex m_splittingMutex;
 
 
     //=================== PRIVATE METHODS =======================================

Code/Mantid/Framework/MDEvents/src/MDGridBox.cpp

@@ -147,7 +147,7 @@ namespace MDEvents
     typename std::vector<MDE>::const_iterator it = events.begin();
     typename std::vector<MDE>::const_iterator it_end = events.end();
     for (; it != it_end; ++it)
-        addEvent(*it);
+        addEventUnsafe(*it);
 
     // Copy the cached numbers from the incoming box. This is quick - don't need to refresh cache
     this->nPoints = box->getNPoints();
@@ -737,11 +737,16 @@ namespace MDEvents
     // You can only split it if it is a MDBox (not MDGridBox).
     MDBox<MDE, nd> * box = dynamic_cast<MDBox<MDE, nd> *>(boxes[index]);
     if (!box) return;
-    // Track how many MDBoxes there are in the overall workspace
-    this->m_BoxController->trackNumBoxes(box->getDepth());
-    // Construct the grid box. This should take the object out of the disk MRU
-    MDGridBox<MDE, nd> * gridbox = new MDGridBox<MDE, nd>(box);
+    MDGridBox<MDE, nd> * gridbox;
 
+    { // Lock against accessing the same box while splitting it
+      Kernel::Mutex::ScopedLock _lock(box->getDataMutex());
+
+      // Track how many MDBoxes there are in the overall workspace (thread-safe call)
+      this->m_BoxController->trackNumBoxes(box->getDepth());
+      // Construct the grid box. This should take the object out of the disk MRU
+      gridbox = new MDGridBox<MDE, nd>(box);
+    }
     // Delete the old ungridded box
     delete boxes[index];
     // And now we have a gridded box instead of a boring old regular box.
@@ -783,6 +788,7 @@ namespace MDEvents
   TMDE(
   void MDGridBox)::splitAllIfNeeded(ThreadScheduler * ts)
   {
+    return; // TODO: remove this method when not needeed
     for (size_t i=0; i < numBoxes; ++i)
     {
       MDBox<MDE, nd> * box = dynamic_cast<MDBox<MDE, nd> *>(boxes[i]);
@@ -884,7 +890,17 @@ namespace MDEvents
 
     // Add it to the contained box
     if (index < numBoxes) // avoid segfaults for floating point round-off errors.
+    {
+      if (boxes[index]->getNPoints() >= this->m_BoxController->getSplitThreshold())
+      {
+        if (boxes[index]->getDepth() < this->m_BoxController->getMaxDepth())
+        {
+          Mantid::Kernel::Mutex::ScopedLock _lock(m_splittingMutex);
+          this->splitContents(index, NULL);
+        }
+      }
       boxes[index]->addEvent(event);
+    }
   }
 
   //-----------------------------------------------------------------------------------------------