Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Thread safe changes for Geometry CommonDetUnit #1322

Merged
merged 4 commits into from Nov 10, 2013
Merged

Thread safe changes for Geometry CommonDetUnit #1322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1e6c749
Thread safe changes
vkuznet Nov 4, 2013
fed26db
Replace auto ptr with unique_ptr
vkuznet Nov 5, 2013
6c4c1a0
Fix ptr release
vkuznet Nov 5, 2013
27b7b84
Add missing initialization
vkuznet Nov 6, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 6 additions & 5 deletions Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h
View file
Open in desktop
Expand Up @@ -17,6 +17,7 @@

# include <Geometry/CommonDetUnit/interface/TrackingGeometry.h>
# include <vector>
#include <atomic>

class GlobalTrackingGeometry : public TrackingGeometry
{
Expand Down Expand Up @@ -59,11 +60,11 @@ class GlobalTrackingGeometry : public TrackingGeometry
// The const methods claim to simply return these vectors,
// but actually, they'll fill them up the first time they
// are called, which is rare (or never).
mutable DetTypeContainer theDetTypes;
mutable DetUnitContainer theDetUnits;
mutable DetContainer theDets;
mutable DetIdContainer theDetUnitIds;
mutable DetIdContainer theDetIds;
mutable std::atomic<DetTypeContainer*> theDetTypes;
mutable std::atomic<DetUnitContainer*> theDetUnits;
mutable std::atomic<DetContainer*> theDets;
mutable std::atomic<DetIdContainer*> theDetUnitIds;
mutable std::atomic<DetIdContainer*> theDetIds;
};
#endif

152 changes: 95 additions & 57 deletions Geometry/CommonDetUnit/src/GlobalTrackingGeometry.cc
View file
Open in desktop
Expand Up @@ -7,13 +7,26 @@

#include <Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h>
#include <FWCore/Utilities/interface/Exception.h>
#include <memory>

GlobalTrackingGeometry::GlobalTrackingGeometry(std::vector<const TrackingGeometry*>& geos)
: theGeometries(geos)
: theGeometries(geos),
theDetTypes(nullptr), theDetUnits(nullptr), theDets(nullptr), theDetUnitIds(nullptr), theDetIds(nullptr)
{}

GlobalTrackingGeometry::~GlobalTrackingGeometry()
{}
{
delete theDetTypes;
theDetTypes = nullptr;
delete theDetUnits;
theDetUnits = nullptr;
delete theDets;
theDets = nullptr;
delete theDetUnitIds;
theDetUnitIds = nullptr;
delete theDetIds;
theDetIds = nullptr;
}

const GeomDetUnit* GlobalTrackingGeometry::idToDetUnit(DetId id) const {

Expand Down Expand Up @@ -54,79 +67,104 @@ const TrackingGeometry* GlobalTrackingGeometry::slaveGeometry(DetId id) const {
const TrackingGeometry::DetTypeContainer&
GlobalTrackingGeometry::detTypes( void ) const
{
if ( ! theDetTypes.empty() ) return theDetTypes;
for( std::vector<const TrackingGeometry*>::const_iterator geom = theGeometries.begin(), geomEnd = theGeometries.end();
geom != geomEnd; ++geom )
{
if( *geom == 0 ) continue;
DetTypeContainer detTypes(( *geom )->detTypes());
if( detTypes.size() + theDetTypes.size() < theDetTypes.capacity()) theDetTypes.resize( detTypes.size() + theDetTypes.size());
for( DetTypeContainer::const_iterator detType = detTypes.begin(), detTypeEnd = detTypes.end(); detType != detTypeEnd; ++detType )
theDetTypes.push_back( *detType );
}
return theDetTypes;
if (!theDetTypes.load(std::memory_order_acquire)) {
std::unique_ptr<DetTypeContainer> ptr{new DetTypeContainer()};
for( auto geom = theGeometries.cbegin(), geomEnd = theGeometries.cend(); geom != geomEnd; ++geom )
{
if( *geom == 0 ) continue;
DetTypeContainer detTypes(( *geom )->detTypes());
if( detTypes.size() + ptr->size() < ptr->capacity()) ptr->resize( detTypes.size() + ptr->size());
for( auto detType = detTypes.cbegin(), detTypeEnd = detTypes.cend(); detType != detTypeEnd; ++detType )
ptr->push_back( *detType );
}
DetTypeContainer* expect = nullptr;
if(theDetTypes.compare_exchange_strong(expect, ptr.get(), std::memory_order_acq_rel)) {
ptr.release();
}
}
return *theDetTypes.load(std::memory_order_acquire);
}

const TrackingGeometry::DetUnitContainer&
GlobalTrackingGeometry::detUnits( void ) const
{
if( ! theDetUnits.empty()) return theDetUnits;
for( std::vector<const TrackingGeometry*>::const_iterator geom = theGeometries.begin(), geomEnd = theGeometries.end();
geom != geomEnd; ++geom )
{
if( *geom == 0 ) continue;
DetUnitContainer detUnits(( *geom )->detUnits());
if( detUnits.size() + theDetUnits.size() < theDetUnits.capacity()) theDetUnits.resize( detUnits.size() + theDetUnits.size());
for( DetUnitContainer::const_iterator detUnit = detUnits.begin(), detUnitEnd = detUnits.end(); detUnit != detUnitEnd; ++detUnit )
theDetUnits.push_back( *detUnit );
}
return theDetUnits;
if (!theDetUnits.load(std::memory_order_acquire)) {
std::unique_ptr<DetUnitContainer> ptr{new DetUnitContainer()};
for( auto geom = theGeometries.cbegin(), geomEnd = theGeometries.cend(); geom != geomEnd; ++geom )
{
if( *geom == 0 ) continue;
DetUnitContainer detUnits(( *geom )->detUnits());
if( detUnits.size() + ptr->size() < ptr->capacity()) ptr->resize( detUnits.size() + ptr->size());
for( auto detUnit = detUnits.cbegin(), detUnitEnd = detUnits.cend(); detUnit != detUnitEnd; ++detUnit )
ptr->push_back( *detUnit );
}
DetUnitContainer* expect = nullptr;
if(theDetUnits.compare_exchange_strong(expect, ptr.get(), std::memory_order_acq_rel)) {
ptr.release();
}
}
return *theDetUnits.load(std::memory_order_acquire);
}

const TrackingGeometry::DetContainer&
GlobalTrackingGeometry::dets( void ) const
{
if( ! theDets.empty()) return theDets;
for( std::vector<const TrackingGeometry*>::const_iterator geom = theGeometries.begin(), geomEnd = theGeometries.end();
geom != geomEnd; ++geom )
{
if( *geom == 0 ) continue;
DetContainer dets(( *geom )->dets());
if( dets.size() + theDets.size() < theDets.capacity()) theDets.resize( dets.size() + theDets.size());
for( DetContainer::const_iterator det = dets.begin(), detEnd = dets.end(); det != detEnd; ++det )
theDets.push_back( *det );
}
return theDets;
if (!theDets.load(std::memory_order_acquire)) {
std::unique_ptr<DetContainer> ptr{new DetContainer()};
for( auto geom = theGeometries.cbegin(), geomEnd = theGeometries.cend(); geom != geomEnd; ++geom )
{
if( *geom == 0 ) continue;
DetContainer dets(( *geom )->dets());
if( dets.size() + ptr->size() < ptr->capacity()) ptr->resize( dets.size() + ptr->size());
for( auto det = dets.cbegin(), detEnd = dets.cend(); det != detEnd; ++det )
ptr->push_back( *det );
}
DetContainer* expect = nullptr;
if(theDets.compare_exchange_strong(expect, ptr.get(), std::memory_order_acq_rel)) {
ptr.release();
}
}
return *theDets.load(std::memory_order_acquire);
}

const TrackingGeometry::DetIdContainer&
GlobalTrackingGeometry::detUnitIds( void ) const
{
if( ! theDetUnitIds.empty()) return theDetUnitIds;
for( std::vector<const TrackingGeometry*>::const_iterator geom = theGeometries.begin(), geomEnd = theGeometries.end();
geom != geomEnd; ++geom )
{
if( *geom == 0 ) continue;
DetIdContainer detUnitIds(( *geom )->detUnitIds());
if( detUnitIds.size() + theDetUnitIds.size() < theDetUnitIds.capacity()) theDetUnitIds.resize( detUnitIds.size() + theDetUnitIds.size());
for( DetIdContainer::const_iterator detUnitId = detUnitIds.begin(), detUnitIdEnd = detUnitIds.end(); detUnitId != detUnitIdEnd; ++detUnitId )
theDetUnitIds.push_back( *detUnitId );
}
return theDetUnitIds;
if (!theDetUnitIds.load(std::memory_order_acquire)) {
std::unique_ptr<DetIdContainer> ptr{new DetIdContainer()};
for( auto geom = theGeometries.cbegin(), geomEnd = theGeometries.cend(); geom != geomEnd; ++geom )
{
if( *geom == 0 ) continue;
DetIdContainer detUnitIds(( *geom )->detUnitIds());
if( detUnitIds.size() + ptr->size() < ptr->capacity()) ptr->resize( detUnitIds.size() + ptr->size());
for( auto detUnitId = detUnitIds.cbegin(), detUnitIdEnd = detUnitIds.cend(); detUnitId != detUnitIdEnd; ++detUnitId )
ptr->push_back( *detUnitId );
}
DetIdContainer* expect = nullptr;
if(theDetUnitIds.compare_exchange_strong(expect, ptr.get(), std::memory_order_acq_rel)) {
ptr.release();
}
}
return *theDetUnitIds.load(std::memory_order_acquire);
}

const TrackingGeometry::DetIdContainer&
GlobalTrackingGeometry::detIds( void ) const
{
if( ! theDetIds.empty() ) return theDetIds;
for( std::vector<const TrackingGeometry*>::const_iterator geom = theGeometries.begin(), geomEnd = theGeometries.end();
geom != geomEnd; ++geom )
{
if( *geom == 0 ) continue;
DetIdContainer detIds(( *geom )->detIds());
if( detIds.size() + theDetIds.size() < theDetIds.capacity()) theDetIds.resize( detIds.size() + theDetIds.size());
for( DetIdContainer::const_iterator detId = detIds.begin(), detIdEnd = detIds.end(); detId != detIdEnd; ++detId )
theDetIds.push_back( *detId );
}
return theDetIds;
if (!theDetIds.load(std::memory_order_acquire)) {
std::unique_ptr<DetIdContainer> ptr{new DetIdContainer()};
for( auto geom = theGeometries.cbegin(), geomEnd = theGeometries.cend(); geom != geomEnd; ++geom )
{
if( *geom == 0 ) continue;
DetIdContainer detIds(( *geom )->detIds());
if( detIds.size() + ptr->size() < ptr->capacity()) ptr->resize( detIds.size() + ptr->size());
for( auto detId = detIds.cbegin(), detIdEnd = detIds.cend(); detId != detIdEnd; ++detId )
ptr->push_back( *detId );
}
DetIdContainer* expect = nullptr;
if(theDetIds.compare_exchange_strong(expect, ptr.get(), std::memory_order_acq_rel)) {
ptr.release();
}
}
return *theDetIds.load(std::memory_order_acquire);
}