From 12ad48b6fcde7c41bad94a8072b5db31a4f86884 Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Wed, 20 Mar 2019 20:32:45 +0000 Subject: Enable clang tidy performance and fixes --- Jamroot.jam | 2 +- icetray/icetray/icetrayService.cpp | 8 +++++--- icetray/icetray/icetrayService.h | 2 +- icetray/icetray/logger.cpp | 8 ++++---- icetray/icetray/logger.h | 10 +++++----- icetray/icetray/options.cpp | 6 +++--- icetray/icetray/options.h | 2 +- 7 files changed, 20 insertions(+), 18 deletions(-) diff --git a/Jamroot.jam b/Jamroot.jam index 909ef13..6201edb 100644 --- a/Jamroot.jam +++ b/Jamroot.jam @@ -21,7 +21,7 @@ project tidy:misc-* #tidy:modernize-* tidy:hicpp-* -#tidy:performance-* + tidy:performance-* ; build-project icetray ; diff --git a/icetray/icetray/icetrayService.cpp b/icetray/icetray/icetrayService.cpp index 77e5ba6..b0770eb 100644 --- a/icetray/icetray/icetrayService.cpp +++ b/icetray/icetray/icetrayService.cpp @@ -30,7 +30,7 @@ namespace IceTray { } Service * - Service::create(Ice::CommunicatorPtr) + Service::create(const Ice::CommunicatorPtr &) { auto serviceFactories = AdHoc::PluginManager::getDefault()->getAll(); // NOLINTNEXTLINE(hicpp-no-array-decay) @@ -51,7 +51,7 @@ namespace IceTray { Service::configureLoggers(const Ice::ObjectAdapterPtr & adp, const Ice::PropertiesPtr & p) { auto logManager = LOGMANAGER(); - for (auto logWriterFactory : AdHoc::PluginManager::getDefault()->getAll()) { + for (const auto & logWriterFactory : AdHoc::PluginManager::getDefault()->getAll()) { auto logWriter = logWriterFactory->implementation()->create(p); if (logWriter->lowestLevel({})) { auto prx = Ice::uncheckedCast(adp->addWithUUID(logWriter)); @@ -65,7 +65,7 @@ namespace IceTray { Service::shutdownLoggers() { auto logManager = LOGMANAGER(); - for (auto prx : logWriters) { + for (const auto & prx : logWriters) { logManager->removeWriter(prx); } } @@ -91,6 +91,8 @@ namespace IceTray { extern "C" { DLL_PUBLIC IceBox::Service * + // Public ICE Box API signature + // NOLINTNEXTLINE(performance-unnecessary-value-param) createIceTrayService(Ice::CommunicatorPtr ic) { return IceTray::Service::create(ic); diff --git a/icetray/icetray/icetrayService.h b/icetray/icetray/icetrayService.h index 4bcd350..6ea6a77 100644 --- a/icetray/icetray/icetrayService.h +++ b/icetray/icetray/icetrayService.h @@ -23,7 +23,7 @@ namespace IceTray { DB::ConnectionPoolPtr getConnectionPool(const Ice::CommunicatorPtr & ic, const std::string & type, const std::string & prefix); static Service * getCurrent(); - static Service * create(Ice::CommunicatorPtr); + static Service * create(const Ice::CommunicatorPtr &); private: void configureLoggers(const Ice::ObjectAdapterPtr &, const Ice::PropertiesPtr &); diff --git a/icetray/icetray/logger.cpp b/icetray/icetray/logger.cpp index a6e61b4..f50eb0f 100644 --- a/icetray/icetray/logger.cpp +++ b/icetray/icetray/logger.cpp @@ -43,7 +43,7 @@ namespace IceTray { { SharedLock(_lock); while (fl != logs.end()) { - for (auto log : *fl) { + for (const auto & log : *fl) { log->message(priority, domain, msg); } fl++; @@ -142,7 +142,7 @@ namespace IceTray { } void - LogManager::addWriter(LogWriterPrxPtr writer) + LogManager::addWriter(const LogWriterPrxPtr & writer) { ScopeLock(_lock) { logWriters.insert(writer); @@ -152,7 +152,7 @@ namespace IceTray { } void - LogManager::removeWriter(LogWriterPrxPtr writer) + LogManager::removeWriter(const LogWriterPrxPtr & writer) { ScopeLock(_lock) { logWriters.erase(writer); @@ -172,7 +172,7 @@ namespace IceTray { logDomains.insert({ { }, level }); } - AbstractLogWriter::AbstractLogWriter(const std::string & prefix, Ice::PropertiesPtr p) + AbstractLogWriter::AbstractLogWriter(const std::string & prefix, const Ice::PropertiesPtr & p) { if (!p || prefix.empty()) { logDomains.insert({ { }, LogLevel::WARNING }); diff --git a/icetray/icetray/logger.h b/icetray/icetray/logger.h index 00e948d..1571cad 100644 --- a/icetray/icetray/logger.h +++ b/icetray/icetray/logger.h @@ -79,8 +79,8 @@ namespace IceTray { LoggerPtr getLogger(const std::type_info &); LoggerPtr getLogger(const std::string &); LogLevelWriters getLogsForDomain(const Domain &) const; - void addWriter(LogWriterPrxPtr writer); - void removeWriter(LogWriterPrxPtr writer); + void addWriter(const LogWriterPrxPtr & writer); + void removeWriter(const LogWriterPrxPtr & writer); static LogManager * getDefault(); @@ -97,9 +97,9 @@ namespace IceTray { IceUtil::Optional level(Domain, const Ice::Current &) override; protected: - AbstractLogWriter() = default; - AbstractLogWriter(LogLevel level); - AbstractLogWriter(const std::string & prefix, Ice::PropertiesPtr p); + explicit AbstractLogWriter() = default; + explicit AbstractLogWriter(LogLevel level); + explicit AbstractLogWriter(const std::string & prefix, const Ice::PropertiesPtr & p); typedef std::map LogDomains; LogDomains logDomains; diff --git a/icetray/icetray/options.cpp b/icetray/icetray/options.cpp index a23ebd7..65c7836 100644 --- a/icetray/icetray/options.cpp +++ b/icetray/icetray/options.cpp @@ -23,7 +23,7 @@ namespace IceTray { OptionsCollation::OptionsCollation() { auto defManager = AdHoc::PluginManager::getDefault(); - for (auto f : defManager->getAll()) { + for (const auto & f : defManager->getAll()) { auto o = f->implementation()->create(); auto & inst = *o; defManager->add(o, typeid(inst).name(), __FILE__, __LINE__); @@ -34,13 +34,13 @@ namespace IceTray { OptionsCollation::~OptionsCollation() { auto defManager = AdHoc::PluginManager::getDefault(); - for (auto o : defManager->getAll()) { + for (const auto & o : defManager->getAll()) { defManager->remove(o->name); } } void - OptionsCollation::apply(Ice::PropertiesPtr p) + OptionsCollation::apply(const Ice::PropertiesPtr & p) { po::parsed_options result(&all); diff --git a/icetray/icetray/options.h b/icetray/icetray/options.h index d346904..f78cc22 100644 --- a/icetray/icetray/options.h +++ b/icetray/icetray/options.h @@ -40,7 +40,7 @@ namespace IceTray { OptionsCollation(); ~OptionsCollation(); - void apply(Ice::PropertiesPtr p); + void apply(const Ice::PropertiesPtr & p); std::ostream & write(std::ostream &) const; private: -- cgit v1.2.3