HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/SciQLOPCore Commit - r47:e76c060d7b97

Deleting a variable which has pending transactions did lead to a segfault...

jeandet -

r47:e76c060d7b97

parent child

Context file:

r47:e76c060d7b97

src/Variable/VariableController2.cpp +21 -1

                     QMap<QUuid,std::shared_ptr<VariableSynchronizationGroup2>> _synchronizationGroups;
                     QReadWriteLock _lock{QReadWriteLock::Recursive};
                 }_maps;
+                std::vector<QUuid> _variablesToRemove;
                 QThreadPool* _ThreadPool;
                 VCTransactionsQueues _transactions;
                 std::unique_ptr<VariableCacheStrategy> _cacheStrategy;
                     this->_processTransactions();
                 }
+                void _cleanupVariables()
+                {
+                    for(auto id:_variablesToRemove)
+                    {
+                        auto v = this->variable(id);
+                        if(!hasPendingTransactions(v))
+                        {
+                            _variablesToRemove.erase(std::remove(_variablesToRemove.begin(), _variablesToRemove.end(), id), _variablesToRemove.end());
+                            this->deleteVariable(v);
+                        }
+                    }
+                }
                 void _processTransactions(bool fragmented=false)
                 {
                     auto nextTransactions = _transactions.nextTransactions();
                             }
                         }
                     }
+                    //after each transaction update we get a new distribution of idle and working variables
+                    //so we can delete variables which are waiting to be deleted if they are now idle
+                    _cleanupVariables();
                 }
                 std::map<QUuid,DateTimeRange> _computeAllRangesInGroup(const std::shared_ptr<Variable>& refVar, DateTimeRange r)
                 void deleteVariable(const std::shared_ptr<Variable>& variable)
                 {
-                    _maps.removeVariable(variable);
+                    if(!hasPendingTransactions(variable))
+                        _maps.removeVariable(variable);
+                    else
+                        _variablesToRemove.push_back(variable->ID());
                 }
                 void asyncChangeRange(const std::shared_ptr<Variable>& variable, const DateTimeRange& r)

tests/Variable/TestVariableController2.cpp +1 0

                 }
                 void testCache()
                 {
+                    QSKIP("The cache is disabled for now");
                     TEST_VC2_FIXTURE(10);
                     TEST_VC2_CREATE_DEFAULT_VAR(var1);
                     check_variable_state<RangeType<10>>(var1, range);

tests/Variable/TestVariableController2WithSync.cpp +1 0

                     auto var1 = vc.createVariable("var1", {}, provider, range);
                     QVERIFY(SciQLop::containers::contains(vc.variables(), var1));
                     QVERIFY(!callbackCalled);
+                    while (!vc.isReady(var1)) {qApp->processEvents();}
                     vc.deleteVariable(var1);
                     QVERIFY(!SciQLop::containers::contains(vc.variables(), var1));
                     QVERIFY(callbackCalled);

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages