From cb2b394d46fccffa874f98d176dbc61228ee334d Mon Sep 17 00:00:00 2001
From: pospelov <pospelov@fz-juelich.de>
Date: Thu, 21 Mar 2013 18:04:31 +0100
Subject: [PATCH] Removed instance() from python functional tests; ISingleton
and MaterialManager are (probably) thread safe now
---
Core/Samples/inc/MaterialManager.h | 8 ++++----
Core/Samples/src/MaterialManager.cpp | 7 +++++++
Core/Tools/inc/ISingleton.h | 6 +++---
.../Components/SampleEditor/SampleFactory.h | 4 ++--
.../FunctionalTests/TestPyCore/isgisaxs01.py | 5 ++---
.../FunctionalTests/TestPyCore/isgisaxs02.py | 3 +--
.../FunctionalTests/TestPyCore/isgisaxs03.py | 15 ++++++--------
.../FunctionalTests/TestPyCore/isgisaxs04.py | 10 ++++------
.../FunctionalTests/TestPyCore/isgisaxs06.py | 20 ++++++++-----------
.../FunctionalTests/TestPyCore/isgisaxs07.py | 3 +--
.../FunctionalTests/TestPyCore/isgisaxs08.py | 10 ++++------
.../FunctionalTests/TestPyCore/isgisaxs09.py | 10 ++++------
.../FunctionalTests/TestPyCore/isgisaxs10.py | 5 ++---
.../FunctionalTests/TestPyCore/isgisaxs11.py | 3 +--
.../FunctionalTests/TestPyCore/isgisaxs15.py | 3 +--
15 files changed, 50 insertions(+), 62 deletions(-)
diff --git a/Core/Samples/inc/MaterialManager.h b/Core/Samples/inc/MaterialManager.h
index acaa4670175..d09e412f729 100644
--- a/Core/Samples/inc/MaterialManager.h
+++ b/Core/Samples/inc/MaterialManager.h
@@ -26,7 +26,7 @@
//! Manager of materials used in simulation.
//!
//! It is a singleton which provides common and unique interface for
-//! material creation and access. No thread safety.
+//! material creation and access.
class MaterialManager: public ISingleton<MaterialManager>
{
@@ -36,15 +36,15 @@ public:
//! definition of materials container
typedef std::map<std::string, IMaterial *> materials_t;
- //! return material from database
+ //! return material from container
static const IMaterial *getMaterial(const std::string &name)
{ return instance().this_getMaterial(name); }
- //! add material to the database
+ //! add material to the container
static const IMaterial *getHomogeneousMaterial(const std::string &name, const complex_t &refractive_index)
{ return instance().this_getHomogeneousMaterial(name, refractive_index); }
- //! add material to the database
+ //! add material to the container
static const IMaterial *getHomogeneousMaterial(const std::string &name, double refractive_index_real, double refractive_index_imag)
{ return instance().this_getHomogeneousMaterial(name, refractive_index_real, refractive_index_imag); }
diff --git a/Core/Samples/src/MaterialManager.cpp b/Core/Samples/src/MaterialManager.cpp
index ebc606fe47c..f79cb7d31e0 100644
--- a/Core/Samples/src/MaterialManager.cpp
+++ b/Core/Samples/src/MaterialManager.cpp
@@ -16,10 +16,13 @@
#include "MaterialManager.h"
#include "Exceptions.h"
#include "MessageSvc.h"
+#include <boost/thread.hpp>
// clean material database
void MaterialManager::clear() {
+ static boost::mutex single_mutex;
+ boost::unique_lock<boost::mutex> single_lock( single_mutex );
for(materials_t::iterator it = m_materials.begin(); it!= m_materials.end(); ++it) {
if( (*it).second ) delete (*it).second;
}
@@ -29,6 +32,8 @@ void MaterialManager::clear() {
// get material
const IMaterial *MaterialManager::this_getMaterial(const std::string &name)
{
+ static boost::mutex single_mutex;
+ boost::unique_lock<boost::mutex> single_lock( single_mutex );
materials_t::const_iterator pos = m_materials.find(name);
if( pos != m_materials.end()) {
return pos->second;
@@ -41,6 +46,8 @@ const IMaterial *MaterialManager::this_getMaterial(const std::string &name)
// Create material and add into database using name of material as indentifier.
const IMaterial *MaterialManager::this_getHomogeneousMaterial(const std::string &name, const complex_t &refractive_index)
{
+ static boost::mutex single_mutex;
+ boost::unique_lock<boost::mutex> single_lock( single_mutex );
const IMaterial *mat = getMaterial(name);
if( mat ) {
// check if user is trying to create material with same name but different parameters
diff --git a/Core/Tools/inc/ISingleton.h b/Core/Tools/inc/ISingleton.h
index a130d6c82bf..ff1b556a8f0 100644
--- a/Core/Tools/inc/ISingleton.h
+++ b/Core/Tools/inc/ISingleton.h
@@ -19,7 +19,7 @@
#include <stdexcept>
#include <iostream>
#include <typeinfo>
-//#include <boost/thread.hpp>
+#include <boost/thread.hpp>
template <class T>
class ISingleton
@@ -28,8 +28,8 @@ public:
static T &instance()
{
-// static boost::mutex single_mutex;
-// boost::unique_lock<boost::mutex> single_lock( single_mutex );
+ static boost::mutex single_mutex;
+ boost::unique_lock<boost::mutex> single_lock( single_mutex );
if( !m_instance) {
if( m_destroyed ) {
onDeadReference();
diff --git a/GUI/coregui/Views/Components/SampleEditor/SampleFactory.h b/GUI/coregui/Views/Components/SampleEditor/SampleFactory.h
index 4700d3912df..864aa360231 100644
--- a/GUI/coregui/Views/Components/SampleEditor/SampleFactory.h
+++ b/GUI/coregui/Views/Components/SampleEditor/SampleFactory.h
@@ -25,8 +25,8 @@ public:
complex_t n_air(1.0, 0.0);
complex_t n_substrate(1.0-6e-6, 2e-8);
complex_t n_particle(1.0-6e-4, 2e-8);
- const IMaterial *p_air_material = MaterialManager::instance().addHomogeneousMaterial("Air", n_air);
- const IMaterial *p_substrate_material = MaterialManager::instance().addHomogeneousMaterial("Substrate", n_substrate);
+ const IMaterial *p_air_material = MaterialManager::getHomogeneousMaterial("Air", n_air);
+ const IMaterial *p_substrate_material = MaterialManager::getHomogeneousMaterial("Substrate", n_substrate);
Layer air_layer;
air_layer.setMaterial(p_air_material);
Layer substrate_layer;
diff --git a/Tests/FunctionalTests/TestPyCore/isgisaxs01.py b/Tests/FunctionalTests/TestPyCore/isgisaxs01.py
index 7330ef1a18a..d7165c0cc61 100644
--- a/Tests/FunctionalTests/TestPyCore/isgisaxs01.py
+++ b/Tests/FunctionalTests/TestPyCore/isgisaxs01.py
@@ -16,9 +16,8 @@ from libBornAgainCore import *
# ----------------------------------
def RunSimulation():
# defining materials
- matMng = MaterialManager.instance()
- mAmbience = matMng.addHomogeneousMaterial("Air", 1.0, 0.0 )
- mSubstrate = matMng.addHomogeneousMaterial("Substrate", 1.0-6e-6, 2e-8 )
+ mAmbience = MaterialManager.getHomogeneousMaterial("Air", 1.0, 0.0 )
+ mSubstrate = MaterialManager.getHomogeneousMaterial("Substrate", 1.0-6e-6, 2e-8 )
# collection of particles
n_particle = complex(1.0-6e-4, 2e-8)
cylinder_ff = FormFactorCylinder(5*nanometer, 5*nanometer)
diff --git a/Tests/FunctionalTests/TestPyCore/isgisaxs02.py b/Tests/FunctionalTests/TestPyCore/isgisaxs02.py
index 3d2c7e180cc..2926f8a0f87 100644
--- a/Tests/FunctionalTests/TestPyCore/isgisaxs02.py
+++ b/Tests/FunctionalTests/TestPyCore/isgisaxs02.py
@@ -16,8 +16,7 @@ from libBornAgainCore import *
# ----------------------------------
def RunSimulation():
# defining materials
- matMng = MaterialManager.instance()
- mAmbience = matMng.addHomogeneousMaterial("Air", 1.0, 0.0 )
+ mAmbience = MaterialManager.getHomogeneousMaterial("Air", 1.0, 0.0 )
# collection of particles
n_particle = complex(1.0-6e-4, 2e-8)
radius1 = 5.0*nanometer
diff --git a/Tests/FunctionalTests/TestPyCore/isgisaxs03.py b/Tests/FunctionalTests/TestPyCore/isgisaxs03.py
index 9da3180f5c4..24b29a51651 100644
--- a/Tests/FunctionalTests/TestPyCore/isgisaxs03.py
+++ b/Tests/FunctionalTests/TestPyCore/isgisaxs03.py
@@ -16,9 +16,8 @@ from libBornAgainCore import *
def RunSimulationDWBA():
# defining materials
- matMng = MaterialManager.instance()
- mAmbience = matMng.addHomogeneousMaterial("Air", 1.0, 0.0 )
- mSubstrate = matMng.addHomogeneousMaterial("Substrate", 1.0-6e-6, 2e-8 )
+ mAmbience = MaterialManager.getHomogeneousMaterial("Air", 1.0, 0.0 )
+ mSubstrate = MaterialManager.getHomogeneousMaterial("Substrate", 1.0-6e-6, 2e-8 )
# collection of particles
n_particle = complex(1.0-6e-4, 2e-8)
cylinder_ff = FormFactorCylinder(5*nanometer, 5*nanometer)
@@ -51,9 +50,8 @@ def RunSimulationDWBA():
# ----------------------------------
def RunSimulationBA():
# defining materials
- matMng = MaterialManager.instance()
- mAmbience = matMng.addHomogeneousMaterial("Air", 1.0, 0.0 )
- mSubstrate = matMng.addHomogeneousMaterial("Substrate", 1.0-6e-6, 2e-8 )
+ mAmbience = MaterialManager.getHomogeneousMaterial("Air", 1.0, 0.0 )
+ mSubstrate = MaterialManager.getHomogeneousMaterial("Substrate", 1.0-6e-6, 2e-8 )
# collection of particles
n_particle = complex(1.0-6e-4, 2e-8)
cylinder_ff = FormFactorCylinder(5*nanometer, 5*nanometer)
@@ -83,9 +81,8 @@ def RunSimulationBA():
# ----------------------------------
def RunSimulationBA_Size():
# defining materials
- matMng = MaterialManager.instance()
- mAmbience = matMng.addHomogeneousMaterial("Air", 1.0, 0.0 )
- mSubstrate = matMng.addHomogeneousMaterial("Substrate", 1.0-6e-6, 2e-8 )
+ mAmbience = MaterialManager.getHomogeneousMaterial("Air", 1.0, 0.0 )
+ mSubstrate = MaterialManager.getHomogeneousMaterial("Substrate", 1.0-6e-6, 2e-8 )
multi_layer = MultiLayer()
diff --git a/Tests/FunctionalTests/TestPyCore/isgisaxs04.py b/Tests/FunctionalTests/TestPyCore/isgisaxs04.py
index e27d05b787e..4b7a3808750 100644
--- a/Tests/FunctionalTests/TestPyCore/isgisaxs04.py
+++ b/Tests/FunctionalTests/TestPyCore/isgisaxs04.py
@@ -15,9 +15,8 @@ from libBornAgainCore import *
# ----------------------------------
def RunSimulation1():
# defining materials
- matMng = MaterialManager.instance()
- mAmbience = matMng.addHomogeneousMaterial("Air", 1.0, 0.0 )
- mSubstrate = matMng.addHomogeneousMaterial("Substrate", 1.0-6e-6, 2e-8 )
+ mAmbience = MaterialManager.getHomogeneousMaterial("Air", 1.0, 0.0 )
+ mSubstrate = MaterialManager.getHomogeneousMaterial("Substrate", 1.0-6e-6, 2e-8 )
# collection of particles
n_particle = complex(1.0-6e-4, 2e-8)
cylinder_ff = FormFactorCylinder(5*nanometer, 5*nanometer)
@@ -49,9 +48,8 @@ def RunSimulation1():
# ----------------------------------
def RunSimulation2():
# # defining materials
- matMng = MaterialManager.instance()
- mAmbience = matMng.addHomogeneousMaterial("Air", 1.0, 0.0 )
- mSubstrate = matMng.addHomogeneousMaterial("Substrate", 1.0-6e-6, 2e-8 )
+ mAmbience = MaterialManager.getHomogeneousMaterial("Air", 1.0, 0.0 )
+ mSubstrate = MaterialManager.getHomogeneousMaterial("Substrate", 1.0-6e-6, 2e-8 )
# collection of particles
n_particle = complex(1.0-6e-4, 2e-8)
diff --git a/Tests/FunctionalTests/TestPyCore/isgisaxs06.py b/Tests/FunctionalTests/TestPyCore/isgisaxs06.py
index c732716393c..e2e4f037449 100644
--- a/Tests/FunctionalTests/TestPyCore/isgisaxs06.py
+++ b/Tests/FunctionalTests/TestPyCore/isgisaxs06.py
@@ -17,9 +17,8 @@ M_PI = numpy.pi
# ----------------------------------
def RunSimulation_lattice():
# defining materials
- matMng = MaterialManager.instance()
- mAmbience = matMng.addHomogeneousMaterial("Air", 1.0, 0.0 )
- mSubstrate = matMng.addHomogeneousMaterial("Substrate", 1.0-6e-6, 2e-8 )
+ mAmbience = MaterialManager.getHomogeneousMaterial("Air", 1.0, 0.0 )
+ mSubstrate = MaterialManager.getHomogeneousMaterial("Substrate", 1.0-6e-6, 2e-8 )
# collection of particles
lattice_params = Lattice2DIFParameters()
lattice_params.m_length_1 = 10.0*nanometer
@@ -71,9 +70,8 @@ def RunSimulation_lattice():
# ----------------------------------
def RunSimulation_centered():
# defining materials
- matMng = MaterialManager.instance()
- mAmbience = matMng.addHomogeneousMaterial("Air", 1.0, 0.0 )
- mSubstrate = matMng.addHomogeneousMaterial("Substrate", 1.0-6e-6, 2e-8 )
+ mAmbience = MaterialManager.getHomogeneousMaterial("Air", 1.0, 0.0 )
+ mSubstrate = MaterialManager.getHomogeneousMaterial("Substrate", 1.0-6e-6, 2e-8 )
# collection of particles
lattice_params = Lattice2DIFParameters()
lattice_params.m_length_1 = 10.0*nanometer
@@ -130,9 +128,8 @@ def RunSimulation_centered():
# ----------------------------------
def RunSimulation_rotated():
# defining materials
- matMng = MaterialManager.instance()
- mAmbience = matMng.addHomogeneousMaterial("Air", 1.0, 0.0 )
- mSubstrate = matMng.addHomogeneousMaterial("Substrate", 1.0-6e-6, 2e-8 )
+ mAmbience = MaterialManager.getHomogeneousMaterial("Air", 1.0, 0.0 )
+ mSubstrate = MaterialManager.getHomogeneousMaterial("Substrate", 1.0-6e-6, 2e-8 )
# collection of particles
lattice_params = Lattice2DIFParameters()
lattice_params.m_length_1 = 10.0*nanometer
@@ -219,9 +216,8 @@ def RunSimulation_variants():
# IsGISAXS6 functional test sample builder for varying xi angle
def buildSample(xi_value):
n_particle = complex(1.0-6e-4, 2e-8)
- matMng = MaterialManager.instance()
- mAmbience = matMng.addHomogeneousMaterial("Air", 1.0, 0.0 )
- mSubstrate = matMng.addHomogeneousMaterial("Substrate", 1.0-6e-6, 2e-8 )
+ mAmbience = MaterialManager.getHomogeneousMaterial("Air", 1.0, 0.0 )
+ mSubstrate = MaterialManager.getHomogeneousMaterial("Substrate", 1.0-6e-6, 2e-8 )
air_layer = Layer(mAmbience)
substrate_layer = Layer(mSubstrate)
diff --git a/Tests/FunctionalTests/TestPyCore/isgisaxs07.py b/Tests/FunctionalTests/TestPyCore/isgisaxs07.py
index 10091a66f3f..92f27abb483 100644
--- a/Tests/FunctionalTests/TestPyCore/isgisaxs07.py
+++ b/Tests/FunctionalTests/TestPyCore/isgisaxs07.py
@@ -16,8 +16,7 @@ from libBornAgainCore import *
# ----------------------------------
def RunSimulation():
# defining materials
- matMng = MaterialManager.instance()
- mAmbience = matMng.addHomogeneousMaterial("Air", 1.0, 0.0 )
+ mAmbience = MaterialManager.getHomogeneousMaterial("Air", 1.0, 0.0 )
# collection of particles
n_particle = complex(1.0-6e-4, 2e-8)
particle_decoration = ParticleDecoration()
diff --git a/Tests/FunctionalTests/TestPyCore/isgisaxs08.py b/Tests/FunctionalTests/TestPyCore/isgisaxs08.py
index cb8274ee1d8..9a0c71a9fbd 100644
--- a/Tests/FunctionalTests/TestPyCore/isgisaxs08.py
+++ b/Tests/FunctionalTests/TestPyCore/isgisaxs08.py
@@ -16,9 +16,8 @@ M_PI = numpy.pi
# ----------------------------------
def RunSimulation1():
# defining materials
- matMng = MaterialManager.instance()
- mAmbience = matMng.addHomogeneousMaterial("Air", 1.0, 0.0 )
- mSubstrate = matMng.addHomogeneousMaterial("Substrate", 1.0-6e-6, 2e-8 )
+ mAmbience = MaterialManager.getHomogeneousMaterial("Air", 1.0, 0.0 )
+ mSubstrate = MaterialManager.getHomogeneousMaterial("Substrate", 1.0-6e-6, 2e-8 )
# collection of particles
n_particle = complex(1.0-6e-4, 2e-8)
cylinder_ff = FormFactorCylinder(5*nanometer, 5*nanometer)
@@ -55,9 +54,8 @@ def RunSimulation1():
# ----------------------------------
def RunSimulation2():
# defining materials
- matMng = MaterialManager.instance()
- mAmbience = matMng.addHomogeneousMaterial("Air", 1.0, 0.0 )
- mSubstrate = matMng.addHomogeneousMaterial("Substrate", 1.0-6e-6, 2e-8 )
+ mAmbience = MaterialManager.getHomogeneousMaterial("Air", 1.0, 0.0 )
+ mSubstrate = MaterialManager.getHomogeneousMaterial("Substrate", 1.0-6e-6, 2e-8 )
# collection of particles
n_particle = complex(1.0-6e-4, 2e-8)
cylinder_ff = FormFactorCylinder(5*nanometer, 5*nanometer)
diff --git a/Tests/FunctionalTests/TestPyCore/isgisaxs09.py b/Tests/FunctionalTests/TestPyCore/isgisaxs09.py
index 80b78fa5283..010534e2010 100644
--- a/Tests/FunctionalTests/TestPyCore/isgisaxs09.py
+++ b/Tests/FunctionalTests/TestPyCore/isgisaxs09.py
@@ -15,9 +15,8 @@ from libBornAgainCore import *
# ----------------------------------
def RunSimulation1():
# defining materials
- matMng = MaterialManager.instance()
- mAmbience = matMng.addHomogeneousMaterial("Air", 1.0, 0.0 )
- mSubstrate = matMng.addHomogeneousMaterial("Substrate", 1.0-6e-6, 2e-8 )
+ mAmbience = MaterialManager.getHomogeneousMaterial("Air", 1.0, 0.0 )
+ mSubstrate = MaterialManager.getHomogeneousMaterial("Substrate", 1.0-6e-6, 2e-8 )
# collection of particles
n_particle = complex(1.0-6e-4, 2e-8)
pyramid_ff = FormFactorPyramid(5*nanometer, 5*nanometer, deg2rad(54.73 ) )
@@ -49,9 +48,8 @@ def RunSimulation1():
# ----------------------------------
def RunSimulation2():
# defining materials
- matMng = MaterialManager.instance()
- mAmbience = matMng.addHomogeneousMaterial("Air", 1.0, 0.0 )
- mSubstrate = matMng.addHomogeneousMaterial("Substrate", 1.0-6e-6, 2e-8 )
+ mAmbience = MaterialManager.getHomogeneousMaterial("Air", 1.0, 0.0 )
+ mSubstrate = MaterialManager.getHomogeneousMaterial("Substrate", 1.0-6e-6, 2e-8 )
# collection of particles
n_particle = complex(1.0-6e-4, 2e-8)
pyramid_ff = FormFactorPyramid(5*nanometer, 5*nanometer, deg2rad(54.73 ) )
diff --git a/Tests/FunctionalTests/TestPyCore/isgisaxs10.py b/Tests/FunctionalTests/TestPyCore/isgisaxs10.py
index 630e64ed08c..81fcd94dfe6 100644
--- a/Tests/FunctionalTests/TestPyCore/isgisaxs10.py
+++ b/Tests/FunctionalTests/TestPyCore/isgisaxs10.py
@@ -16,9 +16,8 @@ from libBornAgainCore import *
# ----------------------------------
def RunSimulation():
# defining materials
- matMng = MaterialManager.instance()
- mAmbience = matMng.addHomogeneousMaterial("Air", 1.0, 0.0 )
- mSubstrate = matMng.addHomogeneousMaterial("Substrate", 1.0-5e-6, 2e-8 )
+ mAmbience = MaterialManager.getHomogeneousMaterial("Air", 1.0, 0.0 )
+ mSubstrate = MaterialManager.getHomogeneousMaterial("Substrate", 1.0-5e-6, 2e-8 )
# collection of particles
n_particle = complex(1.0-5e-5, 2e-8)
cylinder_ff = FormFactorCylinder(5*nanometer, 5*nanometer)
diff --git a/Tests/FunctionalTests/TestPyCore/isgisaxs11.py b/Tests/FunctionalTests/TestPyCore/isgisaxs11.py
index 1d4e4782a54..629c5031c49 100644
--- a/Tests/FunctionalTests/TestPyCore/isgisaxs11.py
+++ b/Tests/FunctionalTests/TestPyCore/isgisaxs11.py
@@ -16,8 +16,7 @@ from libBornAgainCore import *
# ----------------------------------
def RunSimulation():
# defining materials
- matMng = MaterialManager.instance()
- mAmbience = matMng.addHomogeneousMaterial("Air", 1.0, 0.0 )
+ mAmbience = MaterialManager.getHomogeneousMaterial("Air", 1.0, 0.0 )
# collection of particles
n_particle_shell = complex(1.0-1e-4, 2e-8)
diff --git a/Tests/FunctionalTests/TestPyCore/isgisaxs15.py b/Tests/FunctionalTests/TestPyCore/isgisaxs15.py
index dc77f4639ce..74816e79065 100644
--- a/Tests/FunctionalTests/TestPyCore/isgisaxs15.py
+++ b/Tests/FunctionalTests/TestPyCore/isgisaxs15.py
@@ -15,8 +15,7 @@ from libBornAgainCore import *
# ----------------------------------
def RunSimulation():
# defining materials
- matMng = MaterialManager.instance()
- mAmbience = matMng.addHomogeneousMaterial("Air", 1.0, 0.0 )
+ mAmbience = MaterialManager.getHomogeneousMaterial("Air", 1.0, 0.0 )
# collection of particles
n_particle = complex(1.0-6e-4, 2e-8)
--
GitLab