From 7043ca88224d2a9707abf7493d3dd67fe160aa3f Mon Sep 17 00:00:00 2001 From: Anthony Geay Date: Wed, 1 Apr 2020 09:44:44 +0200 Subject: [PATCH] Fix problem of concurrency --- src/runtime/SalomeHPContainer.cxx | 8 ++++---- src/yacsloader_swig/Test/testSaveLoadRun.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/runtime/SalomeHPContainer.cxx b/src/runtime/SalomeHPContainer.cxx index 5925a9b89..aac34132f 100644 --- a/src/runtime/SalomeHPContainer.cxx +++ b/src/runtime/SalomeHPContainer.cxx @@ -132,9 +132,9 @@ void SalomeHPContainer::shutdown(int level) std::string SalomeHPContainer::getPlacementId(const Task *askingNode) const { - const SalomeContainerMonoHelper *helper(0); + const SalomeContainerMonoHelper *helper(nullptr); { - YACS::BASES::AutoLocker alckCont(const_cast(this)); + std::lock_guard lg(getPG()->getLocker()); helper=_launchModeType.getHelperOfTask(askingNode); } return SalomeContainerTools::GetPlacementId(helper,this,askingNode); @@ -142,9 +142,9 @@ std::string SalomeHPContainer::getPlacementId(const Task *askingNode) const std::string SalomeHPContainer::getFullPlacementId(const Task *askingNode) const { - const SalomeContainerMonoHelper *helper(0); + const SalomeContainerMonoHelper *helper(nullptr); { - YACS::BASES::AutoLocker alckCont(const_cast(this)); + std::lock_guard lg(getPG()->getLocker()); helper=_launchModeType.getHelperOfTask(askingNode); } return SalomeContainerTools::GetFullPlacementId(helper,this,askingNode); diff --git a/src/yacsloader_swig/Test/testSaveLoadRun.py b/src/yacsloader_swig/Test/testSaveLoadRun.py index efafa9c75..6ea538cb9 100755 --- a/src/yacsloader_swig/Test/testSaveLoadRun.py +++ b/src/yacsloader_swig/Test/testSaveLoadRun.py @@ -1337,7 +1337,7 @@ for i in i8: cont.setProperty("nb_proc_per_node","7") # <- here self.assertEqual(n00.getMaxLevelOfParallelism(),7) # <- here pass - + def test19(self): """This test checks the mechanism of YACS that allow PythonNodes to know their DynParaLoop context.""" fname=os.path.join(self.workdir, "test19.xml") -- 2.39.2