Refs #4554 added locks to Paraview renderers

To prevent segfaults from algorithms running in the background
mantidproject · Feb 3, 2012 · bb5b66e · bb5b66e
1 parent f1d981a
commit bb5b66e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/Code/Mantid/Vates/VatesAPI/src/vtkMDEWHexahedronFactory.cpp b/Code/Mantid/Vates/VatesAPI/src/vtkMDEWHexahedronFactory.cpp
@@ -8,11 +8,13 @@
 #include <vtkHexahedron.h>
 #include <vtkPoints.h>
 #include <vtkUnstructuredGrid.h>
+#include "MantidKernel/ReadLock.h"
 
 using namespace Mantid::API;
 using namespace Mantid::MDEvents;
 using namespace Mantid::Geometry;
 using Mantid::Kernel::CPUTimer;
+using Mantid::Kernel::ReadLock;
 
 namespace Mantid
 {
@@ -43,6 +45,8 @@ namespace Mantid
   {
     bool VERBOSE = true;
     CPUTimer tim;
+    // Acquire a scoped read-only lock to the workspace (prevent segfault from algos modifying ws)
+    ReadLock lock(*ws);
 
     // First we get all the boxes, up to the given depth; with or wo the slice function
     std::vector<IMDBox<MDE,nd> *> boxes;

diff --git a/Code/Mantid/Vates/VatesAPI/src/vtkSplatterPlotFactory.cpp b/Code/Mantid/Vates/VatesAPI/src/vtkSplatterPlotFactory.cpp
@@ -9,11 +9,13 @@
 #include <vtkPoints.h>
 #include <vtkUnstructuredGrid.h>
 #include "vtkSystemIncludes.h"
+#include "MantidKernel/ReadLock.h"
 
 using namespace Mantid::API;
 using namespace Mantid::MDEvents;
 using namespace Mantid::Geometry;
 using Mantid::Kernel::CPUTimer;
+using Mantid::Kernel::ReadLock;
 
 namespace Mantid
 {
@@ -44,6 +46,8 @@ namespace Mantid
   {
     bool VERBOSE = true;
     CPUTimer tim;
+    // Acquire a scoped read-only lock to the workspace (prevent segfault from algos modifying ws)
+    ReadLock lock(*ws);
 
     // Find out how many events to skip before making a point
     size_t totalPoints = ws->getNPoints();

diff --git a/Code/Mantid/Vates/VatesAPI/src/vtkThresholdingHexahedronFactory.cpp b/Code/Mantid/Vates/VatesAPI/src/vtkThresholdingHexahedronFactory.cpp
@@ -7,10 +7,12 @@
 #include <vtkRectilinearGrid.h>
 #include <vtkStructuredGrid.h>
 #include "MantidAPI/NullCoordTransform.h"
+#include "MantidKernel/ReadLock.h"
 
 using Mantid::API::IMDWorkspace;
 using Mantid::Kernel::CPUTimer;
 using namespace Mantid::MDEvents;
+using Mantid::Kernel::ReadLock;
 
 namespace Mantid
 {
@@ -99,7 +101,9 @@ namespace VATES
    */
   vtkDataSet* vtkThresholdingHexahedronFactory::create3Dor4D(size_t timestep, bool do4D) const
   {
-
+    // Acquire a scoped read-only lock to the workspace (prevent segfault from algos modifying ws)
+    ReadLock lock(*m_workspace);
+
     const int nBinsX = static_cast<int>( m_workspace->getXDimension()->getNBins() );
     const int nBinsY = static_cast<int>( m_workspace->getYDimension()->getNBins() );
     const int nBinsZ = static_cast<int>( m_workspace->getZDimension()->getNBins() );