Skip to content

Please consider the following formatting changes to #15076 #373

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

Open
alibuild wants to merge 1 commit into
base: pr15076
Choose a base branch
from
Open

Please consider the following formatting changes to #15076 #373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion CCDB/include/CCDB/BasicCCDBManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ T* CCDBManagerInstance::getForTimeStamp(std::string const& path, long timestamp,
}
auto end = std::chrono::system_clock::now();
mTimerMS += std::chrono::duration_cast<std::chrono::milliseconds>(end - start).count();
auto *ref = o2::framework::ServiceRegistryRef::globalDeviceRef();
auto* ref = o2::framework::ServiceRegistryRef::globalDeviceRef();
if (ref && ref->active<framework::DataProcessingStats>()) {
auto& stats = ref->get<o2::framework::DataProcessingStats>();
stats.updateStats({(int)o2::framework::ProcessingStatsId::CCDB_CACHE_HIT, o2::framework::DataProcessingStats::Op::Set, (int64_t)mQueries - mFailures - mFetches});
Expand Down
2 changes: 1 addition & 1 deletion Framework/Core/include/Framework/ServiceRegistryRef.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ class ServiceRegistryRef
mRegistry.unlock(mSalt);
}

static ServiceRegistryRef *globalDeviceRef(ServiceRegistryRef *ref = nullptr);
static ServiceRegistryRef* globalDeviceRef(ServiceRegistryRef* ref = nullptr);

private:
ServiceRegistry& mRegistry;
Expand Down
11 changes: 6 additions & 5 deletions Framework/Core/src/ServiceRegistryRef.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,18 @@
// granted to it by virtue of its status as an Intergovernmental Organization
// or submit itself to any jurisdiction.


#include "Framework/ServiceRegistryRef.h"
namespace o2::framework {
namespace o2::framework
{

ServiceRegistryRef *ServiceRegistryRef::globalDeviceRef(ServiceRegistryRef *ref) {
static ServiceRegistryRef *globalRef = nullptr;
ServiceRegistryRef* ServiceRegistryRef::globalDeviceRef(ServiceRegistryRef* ref)
{
static ServiceRegistryRef* globalRef = nullptr;
if (!globalRef) {
globalRef = ref;
}
// We return a copy, so that it can be cache
return globalRef;
}

}
} // namespace o2::framework