fix #2935: flow crash (#2940)

* fix #2935 * clang format * clang-format 11
NCAR · Dec 21, 2021 · 928fab0 · 928fab0
1 parent c46a700
commit 928fab0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/include/vapor/VaporField.h b/include/vapor/VaporField.h
@@ -75,6 +75,7 @@ class FLOW_API VaporField final : public Field {
     //
     void AssignDataManager(VAPoR::DataMgr *dmgr);
     void UpdateParams(const VAPoR::FlowParams *);
+    void ReleaseLockedGrids();    // Supposed to be invoked at the end of each paintGL event.
 
     //
     // Find one index whose timestamp is just below a given time

diff --git a/lib/flow/VaporField.cpp b/lib/flow/VaporField.cpp
@@ -536,3 +536,5 @@ const VAPoR::Grid *VaporField::_getAGrid(size_t timestep, const std::string &var
     _recentGrids.insert(key, new GridWrapper(grid, _datamgr));
     return grid;
 }
+
+void VaporField::ReleaseLockedGrids() { _recentGrids.clear(); }
diff --git a/lib/render/FlowRenderer.cpp b/lib/render/FlowRenderer.cpp
@@ -5,7 +5,6 @@
 #include <iostream>
 #include <sstream>
 #include <cstring>
-#include <cctype>    // std::isspace
 #include <random>
 #include <algorithm>
 #include <vapor/Progress.h>
@@ -49,7 +48,6 @@ std::string FlowRenderer::_getColorbarVariableName() const { return GetActivePar
 
 int FlowRenderer::_initializeGL()
 {
-    // First prepare the VelocityField
     _velocityField.AssignDataManager(_dataMgr);
     _colorField.AssignDataManager(_dataMgr);
     _timestamps = _dataMgr->GetTimeCoordinates();
@@ -345,6 +343,11 @@ int FlowRenderer::_paintGL(bool fast)
 
     _restoreGLState();
 
+    // Release grids that are acquired during this paint event
+    // before their DataMgr is destroyed by others.
+    _velocityField.ReleaseLockedGrids();
+    _colorField.ReleaseLockedGrids();
+
     return rv;
 }