diff --git a/.clang-tidy b/.clang-tidy index aa6beab1..1d203333 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -1,3 +1,3 @@ --- -Checks: 'cppcoreguidelines-*,misc-unused-alias-decls,misc-unused-parameters,modernize-deprecated-headers,modernize-raw-string-literal,modernize-redundant-void-arg,modernize-use-bool-literals,modernize-use-default-member-init,modernize-use-emplace,modernize-use-equals-default,modernize-use-equals-delete,modernize-use-noexcept,modernize-use-nullptr,modernize-use-override,modernize-use-using,performance-faster-string-find,performance-for-range-copy,performance-unnecessary-copy-initialization,readability-avoid-const-params-in-decls,readability-braces-around-statements,readability-container-size-empty,readability-delete-null-pointer,readability-redundant-member-init,readability-redundant-string-init,readability-static-accessed-through-instance,readability-string-compare' +Checks: 'cppcoreguidelines-*,misc-unused-alias-decls,misc-unused-parameters,modernize-pass-by-value,modernize-deprecated-headers,modernize-raw-string-literal,modernize-redundant-void-arg,modernize-use-bool-literals,modernize-use-default-member-init,modernize-use-emplace,modernize-use-equals-default,modernize-use-equals-delete,modernize-use-noexcept,modernize-use-nullptr,modernize-use-override,modernize-use-using,performance-faster-string-find,performance-for-range-copy,performance-unnecessary-copy-initialization,readability-avoid-const-params-in-decls,readability-braces-around-statements,readability-container-size-empty,readability-delete-null-pointer,readability-redundant-member-init,readability-redundant-string-init,readability-static-accessed-through-instance,readability-string-compare' HeaderFilterRegex: '/(fairmq/)' diff --git a/fairmq/FairMQChannel.cxx b/fairmq/FairMQChannel.cxx index 03524f3c..189baa1a 100644 --- a/fairmq/FairMQChannel.cxx +++ b/fairmq/FairMQChannel.cxx @@ -64,14 +64,14 @@ FairMQChannel::FairMQChannel(const string& name, const string& type, shared_ptr< : FairMQChannel(name, type, DefaultMethod, DefaultAddress, factory) {} -FairMQChannel::FairMQChannel(const string& name, const string& type, const string& method, const string& address, shared_ptr factory) +FairMQChannel::FairMQChannel(string name, string type, string method, string address, shared_ptr factory) : fTransportFactory(factory) , fTransportType(factory ? factory->GetType() : DefaultTransportType) , fSocket(factory ? factory->CreateSocket(type, name) : nullptr) - , fName(name) - , fType(type) - , fMethod(method) - , fAddress(address) + , fName(std::move(name)) + , fType(std::move(type)) + , fMethod(std::move(method)) + , fAddress(std::move(address)) , fSndBufSize(DefaultSndBufSize) , fRcvBufSize(DefaultRcvBufSize) , fSndKernelSize(DefaultSndKernelSize) @@ -111,11 +111,11 @@ FairMQChannel::FairMQChannel(const FairMQChannel& chan) : FairMQChannel(chan, chan.fName) {} -FairMQChannel::FairMQChannel(const FairMQChannel& chan, const string& newName) +FairMQChannel::FairMQChannel(const FairMQChannel& chan, string newName) : fTransportFactory(nullptr) , fTransportType(chan.fTransportType) , fSocket(nullptr) - , fName(newName) + , fName(std::move(newName)) , fType(chan.fType) , fMethod(chan.fMethod) , fAddress(chan.fAddress) diff --git a/fairmq/FairMQChannel.h b/fairmq/FairMQChannel.h index 33e17a6a..9952461b 100644 --- a/fairmq/FairMQChannel.h +++ b/fairmq/FairMQChannel.h @@ -61,7 +61,7 @@ class FairMQChannel /// @param method Socket method (bind/connect) /// @param address Network address to bind/connect to (e.g. "tcp://127.0.0.1:5555" or "ipc://abc") /// @param factory TransportFactory - FairMQChannel(const std::string& name, const std::string& type, const std::string& method, const std::string& address, std::shared_ptr factory); + FairMQChannel(std::string name, std::string type, std::string method, std::string address, std::shared_ptr factory); FairMQChannel(const std::string& name, int index, const fair::mq::Properties& properties); @@ -69,7 +69,7 @@ class FairMQChannel FairMQChannel(const FairMQChannel&); /// Copy Constructor (with new name) - FairMQChannel(const FairMQChannel&, const std::string& name); + FairMQChannel(const FairMQChannel&, std::string name); /// Move constructor // FairMQChannel(FairMQChannel&&) = delete; diff --git a/fairmq/FairMQDevice.cxx b/fairmq/FairMQDevice.cxx index d6b2d5cd..0f29af7d 100644 --- a/fairmq/FairMQDevice.cxx +++ b/fairmq/FairMQDevice.cxx @@ -40,10 +40,10 @@ struct StateSubscription fair::mq::StateQueue& fStateQueue; string fId; - explicit StateSubscription(const string& id, fair::mq::StateMachine& stateMachine, fair::mq::StateQueue& stateQueue) + explicit StateSubscription(string id, fair::mq::StateMachine& stateMachine, fair::mq::StateQueue& stateQueue) : fStateMachine(stateMachine) , fStateQueue(stateQueue) - , fId(id) + , fId(std::move(id)) { fStateMachine.SubscribeToStateChange(fId, [&](fair::mq::State state) { fStateQueue.Push(state); diff --git a/fairmq/FairMQTransportFactory.cxx b/fairmq/FairMQTransportFactory.cxx index 97a21027..7f4b0527 100644 --- a/fairmq/FairMQTransportFactory.cxx +++ b/fairmq/FairMQTransportFactory.cxx @@ -20,11 +20,12 @@ #include #include +#include // move using namespace std; -FairMQTransportFactory::FairMQTransportFactory(const string& id) - : fkId(id) +FairMQTransportFactory::FairMQTransportFactory(string id) + : fkId(std::move(id)) {} auto FairMQTransportFactory::CreateTransportFactory(const string& type, diff --git a/fairmq/FairMQTransportFactory.h b/fairmq/FairMQTransportFactory.h index f157aded..817f0c9c 100644 --- a/fairmq/FairMQTransportFactory.h +++ b/fairmq/FairMQTransportFactory.h @@ -38,7 +38,7 @@ class FairMQTransportFactory public: /// ctor /// @param id Topology wide unique id, usually the device id. - FairMQTransportFactory(const std::string& id); + FairMQTransportFactory(std::string id); auto GetId() const -> const std::string { return fkId; }; diff --git a/fairmq/sdk/commands/Commands.h b/fairmq/sdk/commands/Commands.h index b398eab4..48785f85 100644 --- a/fairmq/sdk/commands/Commands.h +++ b/fairmq/sdk/commands/Commands.h @@ -16,6 +16,7 @@ #include #include #include +#include // move namespace fair::mq::sdk::cmd { @@ -163,9 +164,9 @@ struct SubscriptionHeartbeat : Cmd struct CurrentState : Cmd { - explicit CurrentState(const std::string& id, State currentState) + explicit CurrentState(std::string id, State currentState) : Cmd(Type::current_state) - , fDeviceId(id) + , fDeviceId(std::move(id)) , fCurrentState(currentState) {} @@ -181,9 +182,9 @@ struct CurrentState : Cmd struct TransitionStatus : Cmd { - explicit TransitionStatus(const std::string& deviceId, const uint64_t taskId, const Result result, const Transition transition, State currentState) + explicit TransitionStatus(std::string deviceId, const uint64_t taskId, const Result result, const Transition transition, State currentState) : Cmd(Type::transition_status) - , fDeviceId(deviceId) + , fDeviceId(std::move(deviceId)) , fTaskId(taskId) , fResult(result) , fTransition(transition) @@ -211,10 +212,10 @@ struct TransitionStatus : Cmd struct Config : Cmd { - explicit Config(const std::string& id, const std::string& config) + explicit Config(std::string id, std::string config) : Cmd(Type::config) - , fDeviceId(id) - , fConfig(config) + , fDeviceId(std::move(id)) + , fConfig(std::move(config)) {} std::string GetDeviceId() const { return fDeviceId; } @@ -229,9 +230,9 @@ struct Config : Cmd struct StateChangeSubscription : Cmd { - explicit StateChangeSubscription(const std::string& id, const uint64_t taskId, const Result result) + explicit StateChangeSubscription(std::string id, const uint64_t taskId, const Result result) : Cmd(Type::state_change_subscription) - , fDeviceId(id) + , fDeviceId(std::move(id)) , fTaskId(taskId) , fResult(result) {} @@ -251,9 +252,9 @@ struct StateChangeSubscription : Cmd struct StateChangeUnsubscription : Cmd { - explicit StateChangeUnsubscription(const std::string& id, const uint64_t taskId, const Result result) + explicit StateChangeUnsubscription(std::string id, const uint64_t taskId, const Result result) : Cmd(Type::state_change_unsubscription) - , fDeviceId(id) + , fDeviceId(std::move(id)) , fTaskId(taskId) , fResult(result) {} @@ -273,9 +274,9 @@ struct StateChangeUnsubscription : Cmd struct StateChange : Cmd { - explicit StateChange(const std::string& deviceId, const uint64_t taskId, const State lastState, const State currentState) + explicit StateChange(std::string deviceId, const uint64_t taskId, const State lastState, const State currentState) : Cmd(Type::state_change) - , fDeviceId(deviceId) + , fDeviceId(std::move(deviceId)) , fTaskId(taskId) , fLastState(lastState) , fCurrentState(currentState) diff --git a/fairmq/shmem/Monitor.cxx b/fairmq/shmem/Monitor.cxx index f9efdc81..ea6e5172 100644 --- a/fairmq/shmem/Monitor.cxx +++ b/fairmq/shmem/Monitor.cxx @@ -77,7 +77,7 @@ void signalHandler(int signal) gSignalStatus = signal; } -Monitor::Monitor(const string& shmId, bool selfDestruct, bool interactive, bool viewOnly, unsigned int timeoutInMS, unsigned int intervalInMS, bool monitor, bool cleanOnExit) +Monitor::Monitor(string shmId, bool selfDestruct, bool interactive, bool viewOnly, unsigned int timeoutInMS, unsigned int intervalInMS, bool monitor, bool cleanOnExit) : fSelfDestruct(selfDestruct) , fInteractive(interactive) , fViewOnly(viewOnly) @@ -86,7 +86,7 @@ Monitor::Monitor(const string& shmId, bool selfDestruct, bool interactive, bool , fCleanOnExit(cleanOnExit) , fTimeoutInMS(timeoutInMS) , fIntervalInMS(intervalInMS) - , fShmId(shmId) + , fShmId(std::move(shmId)) , fControlQueueName("fmq_" + fShmId + "_cq") , fTerminating(false) , fHeartbeatTriggered(false) diff --git a/fairmq/shmem/Monitor.h b/fairmq/shmem/Monitor.h index 65ac3a7e..d82483d5 100644 --- a/fairmq/shmem/Monitor.h +++ b/fairmq/shmem/Monitor.h @@ -52,7 +52,7 @@ struct BufferDebugInfo class Monitor { public: - Monitor(const std::string& shmId, bool selfDestruct, bool interactive, bool viewOnly, unsigned int timeoutInMS, unsigned int intervalInMS, bool runAsDaemon, bool cleanOnExit); + Monitor(std::string shmId, bool selfDestruct, bool interactive, bool viewOnly, unsigned int timeoutInMS, unsigned int intervalInMS, bool runAsDaemon, bool cleanOnExit); Monitor(const Monitor&) = delete; Monitor operator=(const Monitor&) = delete; diff --git a/fairmq/shmem/Region.h b/fairmq/shmem/Region.h index 32b1cf9b..2b6a47d5 100644 --- a/fairmq/shmem/Region.h +++ b/fairmq/shmem/Region.h @@ -38,6 +38,7 @@ #include #include #include +#include // move namespace fair::mq::shmem { @@ -54,8 +55,8 @@ struct Region , fFile(nullptr) , fFileMapping() , fQueue(nullptr) - , fCallback(callback) - , fBulkCallback(bulkCallback) + , fCallback(std::move(callback)) + , fBulkCallback(std::move(bulkCallback)) { using namespace boost::interprocess; diff --git a/fairmq/zeromq/UnmanagedRegion.h b/fairmq/zeromq/UnmanagedRegion.h index aa06196b..3f6a32bc 100644 --- a/fairmq/zeromq/UnmanagedRegion.h +++ b/fairmq/zeromq/UnmanagedRegion.h @@ -15,6 +15,7 @@ #include // size_t #include +#include // move #include // mlock @@ -40,8 +41,8 @@ class UnmanagedRegion final : public fair::mq::UnmanagedRegion , fBuffer(malloc(size)) , fSize(size) , fUserFlags(userFlags) - , fCallback(callback) - , fBulkCallback(bulkCallback) + , fCallback(std::move(callback)) + , fBulkCallback(std::move(bulkCallback)) { if (cfg.lock) { LOG(debug) << "Locking region " << fId << "..."; diff --git a/test/plugin_services/_config.cxx b/test/plugin_services/_config.cxx index dc4f7b2c..392bfa0f 100644 --- a/test/plugin_services/_config.cxx +++ b/test/plugin_services/_config.cxx @@ -10,11 +10,12 @@ #include #include #include +#include // move struct MyClass { MyClass() = default; - MyClass(const std::string& a) : msg(a) {} + MyClass(std::string a) : msg(std::move(a)) {} MyClass(const MyClass&) = default; MyClass& operator=(const MyClass& b) = default; std::string msg;