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

Do less cloning of TH1 objects in the DQMStore (backport to 74x) #9267

Merged
merged 2 commits into from
Jun 16, 2015
Merged

Do less cloning of TH1 objects in the DQMStore (backport to 74x) #9267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
25636c8
Do less cloning of TH1 objects in the DQMStore.
May 13, 2015
79c210d
Fix a small error and permissions on MonitorElement files.
May 13, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion DQMServices/Core/interface/MonitorElement.h
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@

class QCriterion;

// tag for a special constructor, see below
struct MonitorElementNoCloneTag {};

/** The base class for all MonitorElements (ME) */
class MonitorElement
{
Expand Down Expand Up @@ -86,8 +89,11 @@ class MonitorElement
uint32_t run = 0,
uint32_t streamId = 0,
uint32_t moduleId = 0);
MonitorElement(const MonitorElement &, MonitorElementNoCloneTag);
MonitorElement(const MonitorElement &);
MonitorElement &operator=(const MonitorElement &);
MonitorElement(MonitorElement &&);
MonitorElement &operator=(const MonitorElement &) = delete;
MonitorElement &operator=(MonitorElement &&) = delete;
~MonitorElement(void);

/// Compare monitor elements, for ordering in sets.
Expand Down
24 changes: 18 additions & 6 deletions DQMServices/Core/src/DQMStore.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,8 +369,11 @@ void DQMStore::mergeAndResetMEsRunSummaryCache(uint32_t run,
continue;
}

MonitorElement global_me(*i);
// don't call the copy constructor
// we are just searching for a global histogram - a copy is not necessary
MonitorElement global_me(*i, MonitorElementNoCloneTag());
global_me.globalize();

// Since this accesses the data, the operation must be
// be locked.
std::lock_guard<std::mutex> guard(book_mutex_);
Expand All @@ -387,7 +390,11 @@ void DQMStore::mergeAndResetMEsRunSummaryCache(uint32_t run,
if (verbose_ > 1)
std::cout << "No global Object found. " << std::endl;
std::pair<std::set<MonitorElement>::const_iterator, bool> gme;
gme = data_.insert(global_me);

// this makes an actual and a single copy with Clone()'ed th1
MonitorElement actual_global_me(*i);
actual_global_me.globalize();
gme = data_.insert(std::move(actual_global_me));
assert(gme.second);
}
// TODO(rovere): eventually reset the local object and mark it as reusable??
Expand Down Expand Up @@ -421,7 +428,7 @@ void DQMStore::mergeAndResetMEsLuminositySummaryCache(uint32_t run,
continue;
}

MonitorElement global_me(*i);
MonitorElement global_me(*i, MonitorElementNoCloneTag());
global_me.globalize();
global_me.setLumi(lumi);
// Since this accesses the data, the operation must be
Expand All @@ -439,7 +446,12 @@ void DQMStore::mergeAndResetMEsLuminositySummaryCache(uint32_t run,
if (verbose_ > 1)
std::cout << "No global Object found. " << std::endl;
std::pair<std::set<MonitorElement>::const_iterator, bool> gme;
gme = data_.insert(global_me);

// this makes an actual and a single copy with Clone()'ed th1
MonitorElement actual_global_me(*i);
actual_global_me.globalize();
actual_global_me.setLumi(lumi);
gme = data_.insert(std::move(actual_global_me));
assert(gme.second);
}
// make the ME reusable for the next LS
Expand Down Expand Up @@ -798,7 +810,7 @@ DQMStore::book(const std::string &dir, const std::string &name,
// Create and initialise core object.
assert(dirs_.count(dir));
MonitorElement proto(&*dirs_.find(dir), name, run_, streamId_, moduleId_);
me = const_cast<MonitorElement &>(*data_.insert(proto).first)
me = const_cast<MonitorElement &>(*data_.insert(std::move(proto)).first)
.initialise((MonitorElement::Kind)kind, h);

// Initialise quality test information.
Expand Down Expand Up @@ -855,7 +867,7 @@ DQMStore::book(const std::string &dir,
// Create it and return for initialisation.
assert(dirs_.count(dir));
MonitorElement proto(&*dirs_.find(dir), name, run_, streamId_, moduleId_);
return &const_cast<MonitorElement &>(*data_.insert(proto).first);
return &const_cast<MonitorElement &>(*data_.insert(std::move(proto)).first);
}
}

Expand Down
44 changes: 17 additions & 27 deletions DQMServices/Core/src/MonitorElement.cc
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,44 +183,34 @@ MonitorElement::MonitorElement(const std::string *path,
scalar_.real = 0;
}

MonitorElement::MonitorElement(const MonitorElement &x)
MonitorElement::MonitorElement(const MonitorElement &x, MonitorElementNoCloneTag)
: data_(x.data_),
scalar_(x.scalar_),
object_(x.object_),
object_(nullptr),
reference_(x.reference_),
refvalue_(x.refvalue_),
refvalue_(nullptr),
qreports_(x.qreports_)
{
if (object_)
object_ = static_cast<TH1 *>(object_->Clone());

if (refvalue_)
refvalue_ = static_cast<TH1 *>(refvalue_->Clone());
}

MonitorElement &
MonitorElement::operator=(const MonitorElement &x)
MonitorElement::MonitorElement(const MonitorElement &x)
: MonitorElement::MonitorElement(x, MonitorElementNoCloneTag())
{
if (this != &x)
{
delete object_;
delete refvalue_;

data_ = x.data_;
scalar_ = x.scalar_;
object_ = x.object_;
reference_ = x.reference_;
refvalue_ = x.refvalue_;
qreports_ = x.qreports_;
if (x.object_)
object_ = static_cast<TH1 *>(x.object_->Clone());

if (object_)
object_ = static_cast<TH1 *>(object_->Clone());
if (x.refvalue_)
refvalue_ = static_cast<TH1 *>(x.refvalue_->Clone());
}

if (refvalue_)
refvalue_ = static_cast<TH1 *>(refvalue_->Clone());
}
MonitorElement::MonitorElement(MonitorElement &&o)
: MonitorElement::MonitorElement(o, MonitorElementNoCloneTag())
{
object_ = o.object_;
refvalue_ = o.refvalue_;

return *this;
o.object_ = nullptr;
o.refvalue_ = nullptr;
}

MonitorElement::~MonitorElement(void)
Expand Down