Apply modernize-pass-by-value

This commit is contained in:
Alexey Rybalchenko 2021-05-27 14:34:31 +02:00 committed by Dennis Klein
parent c847a7ca02
commit 882edbbdb8
12 changed files with 41 additions and 36 deletions

View File

@ -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/)' HeaderFilterRegex: '/(fairmq/)'

View File

@ -64,14 +64,14 @@ FairMQChannel::FairMQChannel(const string& name, const string& type, shared_ptr<
: FairMQChannel(name, type, DefaultMethod, DefaultAddress, factory) : FairMQChannel(name, type, DefaultMethod, DefaultAddress, factory)
{} {}
FairMQChannel::FairMQChannel(const string& name, const string& type, const string& method, const string& address, shared_ptr<FairMQTransportFactory> factory) FairMQChannel::FairMQChannel(string name, string type, string method, string address, shared_ptr<FairMQTransportFactory> factory)
: fTransportFactory(factory) : fTransportFactory(factory)
, fTransportType(factory ? factory->GetType() : DefaultTransportType) , fTransportType(factory ? factory->GetType() : DefaultTransportType)
, fSocket(factory ? factory->CreateSocket(type, name) : nullptr) , fSocket(factory ? factory->CreateSocket(type, name) : nullptr)
, fName(name) , fName(std::move(name))
, fType(type) , fType(std::move(type))
, fMethod(method) , fMethod(std::move(method))
, fAddress(address) , fAddress(std::move(address))
, fSndBufSize(DefaultSndBufSize) , fSndBufSize(DefaultSndBufSize)
, fRcvBufSize(DefaultRcvBufSize) , fRcvBufSize(DefaultRcvBufSize)
, fSndKernelSize(DefaultSndKernelSize) , fSndKernelSize(DefaultSndKernelSize)
@ -111,11 +111,11 @@ FairMQChannel::FairMQChannel(const FairMQChannel& chan)
: FairMQChannel(chan, chan.fName) : FairMQChannel(chan, chan.fName)
{} {}
FairMQChannel::FairMQChannel(const FairMQChannel& chan, const string& newName) FairMQChannel::FairMQChannel(const FairMQChannel& chan, string newName)
: fTransportFactory(nullptr) : fTransportFactory(nullptr)
, fTransportType(chan.fTransportType) , fTransportType(chan.fTransportType)
, fSocket(nullptr) , fSocket(nullptr)
, fName(newName) , fName(std::move(newName))
, fType(chan.fType) , fType(chan.fType)
, fMethod(chan.fMethod) , fMethod(chan.fMethod)
, fAddress(chan.fAddress) , fAddress(chan.fAddress)

View File

@ -61,7 +61,7 @@ class FairMQChannel
/// @param method Socket method (bind/connect) /// @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 address Network address to bind/connect to (e.g. "tcp://127.0.0.1:5555" or "ipc://abc")
/// @param factory TransportFactory /// @param factory TransportFactory
FairMQChannel(const std::string& name, const std::string& type, const std::string& method, const std::string& address, std::shared_ptr<FairMQTransportFactory> factory); FairMQChannel(std::string name, std::string type, std::string method, std::string address, std::shared_ptr<FairMQTransportFactory> factory);
FairMQChannel(const std::string& name, int index, const fair::mq::Properties& properties); FairMQChannel(const std::string& name, int index, const fair::mq::Properties& properties);
@ -69,7 +69,7 @@ class FairMQChannel
FairMQChannel(const FairMQChannel&); FairMQChannel(const FairMQChannel&);
/// Copy Constructor (with new name) /// Copy Constructor (with new name)
FairMQChannel(const FairMQChannel&, const std::string& name); FairMQChannel(const FairMQChannel&, std::string name);
/// Move constructor /// Move constructor
// FairMQChannel(FairMQChannel&&) = delete; // FairMQChannel(FairMQChannel&&) = delete;

View File

@ -40,10 +40,10 @@ struct StateSubscription
fair::mq::StateQueue& fStateQueue; fair::mq::StateQueue& fStateQueue;
string fId; 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) : fStateMachine(stateMachine)
, fStateQueue(stateQueue) , fStateQueue(stateQueue)
, fId(id) , fId(std::move(id))
{ {
fStateMachine.SubscribeToStateChange(fId, [&](fair::mq::State state) { fStateMachine.SubscribeToStateChange(fId, [&](fair::mq::State state) {
fStateQueue.Push(state); fStateQueue.Push(state);

View File

@ -20,11 +20,12 @@
#include <memory> #include <memory>
#include <string> #include <string>
#include <utility> // move
using namespace std; using namespace std;
FairMQTransportFactory::FairMQTransportFactory(const string& id) FairMQTransportFactory::FairMQTransportFactory(string id)
: fkId(id) : fkId(std::move(id))
{} {}
auto FairMQTransportFactory::CreateTransportFactory(const string& type, auto FairMQTransportFactory::CreateTransportFactory(const string& type,

View File

@ -38,7 +38,7 @@ class FairMQTransportFactory
public: public:
/// ctor /// ctor
/// @param id Topology wide unique id, usually the device id. /// @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; }; auto GetId() const -> const std::string { return fkId; };

View File

@ -16,6 +16,7 @@
#include <memory> #include <memory>
#include <type_traits> #include <type_traits>
#include <stdexcept> #include <stdexcept>
#include <utility> // move
namespace fair::mq::sdk::cmd namespace fair::mq::sdk::cmd
{ {
@ -163,9 +164,9 @@ struct SubscriptionHeartbeat : Cmd
struct CurrentState : Cmd struct CurrentState : Cmd
{ {
explicit CurrentState(const std::string& id, State currentState) explicit CurrentState(std::string id, State currentState)
: Cmd(Type::current_state) : Cmd(Type::current_state)
, fDeviceId(id) , fDeviceId(std::move(id))
, fCurrentState(currentState) , fCurrentState(currentState)
{} {}
@ -181,9 +182,9 @@ struct CurrentState : Cmd
struct TransitionStatus : 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) : Cmd(Type::transition_status)
, fDeviceId(deviceId) , fDeviceId(std::move(deviceId))
, fTaskId(taskId) , fTaskId(taskId)
, fResult(result) , fResult(result)
, fTransition(transition) , fTransition(transition)
@ -211,10 +212,10 @@ struct TransitionStatus : Cmd
struct Config : 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) : Cmd(Type::config)
, fDeviceId(id) , fDeviceId(std::move(id))
, fConfig(config) , fConfig(std::move(config))
{} {}
std::string GetDeviceId() const { return fDeviceId; } std::string GetDeviceId() const { return fDeviceId; }
@ -229,9 +230,9 @@ struct Config : Cmd
struct StateChangeSubscription : 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) : Cmd(Type::state_change_subscription)
, fDeviceId(id) , fDeviceId(std::move(id))
, fTaskId(taskId) , fTaskId(taskId)
, fResult(result) , fResult(result)
{} {}
@ -251,9 +252,9 @@ struct StateChangeSubscription : Cmd
struct StateChangeUnsubscription : 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) : Cmd(Type::state_change_unsubscription)
, fDeviceId(id) , fDeviceId(std::move(id))
, fTaskId(taskId) , fTaskId(taskId)
, fResult(result) , fResult(result)
{} {}
@ -273,9 +274,9 @@ struct StateChangeUnsubscription : Cmd
struct StateChange : 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) : Cmd(Type::state_change)
, fDeviceId(deviceId) , fDeviceId(std::move(deviceId))
, fTaskId(taskId) , fTaskId(taskId)
, fLastState(lastState) , fLastState(lastState)
, fCurrentState(currentState) , fCurrentState(currentState)

View File

@ -77,7 +77,7 @@ void signalHandler(int signal)
gSignalStatus = 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) : fSelfDestruct(selfDestruct)
, fInteractive(interactive) , fInteractive(interactive)
, fViewOnly(viewOnly) , fViewOnly(viewOnly)
@ -86,7 +86,7 @@ Monitor::Monitor(const string& shmId, bool selfDestruct, bool interactive, bool
, fCleanOnExit(cleanOnExit) , fCleanOnExit(cleanOnExit)
, fTimeoutInMS(timeoutInMS) , fTimeoutInMS(timeoutInMS)
, fIntervalInMS(intervalInMS) , fIntervalInMS(intervalInMS)
, fShmId(shmId) , fShmId(std::move(shmId))
, fControlQueueName("fmq_" + fShmId + "_cq") , fControlQueueName("fmq_" + fShmId + "_cq")
, fTerminating(false) , fTerminating(false)
, fHeartbeatTriggered(false) , fHeartbeatTriggered(false)

View File

@ -52,7 +52,7 @@ struct BufferDebugInfo
class Monitor class Monitor
{ {
public: 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(const Monitor&) = delete;
Monitor operator=(const Monitor&) = delete; Monitor operator=(const Monitor&) = delete;

View File

@ -38,6 +38,7 @@
#include <cerrno> #include <cerrno>
#include <chrono> #include <chrono>
#include <ios> #include <ios>
#include <utility> // move
namespace fair::mq::shmem namespace fair::mq::shmem
{ {
@ -54,8 +55,8 @@ struct Region
, fFile(nullptr) , fFile(nullptr)
, fFileMapping() , fFileMapping()
, fQueue(nullptr) , fQueue(nullptr)
, fCallback(callback) , fCallback(std::move(callback))
, fBulkCallback(bulkCallback) , fBulkCallback(std::move(bulkCallback))
{ {
using namespace boost::interprocess; using namespace boost::interprocess;

View File

@ -15,6 +15,7 @@
#include <cstddef> // size_t #include <cstddef> // size_t
#include <string> #include <string>
#include <utility> // move
#include <sys/mman.h> // mlock #include <sys/mman.h> // mlock
@ -40,8 +41,8 @@ class UnmanagedRegion final : public fair::mq::UnmanagedRegion
, fBuffer(malloc(size)) , fBuffer(malloc(size))
, fSize(size) , fSize(size)
, fUserFlags(userFlags) , fUserFlags(userFlags)
, fCallback(callback) , fCallback(std::move(callback))
, fBulkCallback(bulkCallback) , fBulkCallback(std::move(bulkCallback))
{ {
if (cfg.lock) { if (cfg.lock) {
LOG(debug) << "Locking region " << fId << "..."; LOG(debug) << "Locking region " << fId << "...";

View File

@ -10,11 +10,12 @@
#include <fairmq/tools/Strings.h> #include <fairmq/tools/Strings.h>
#include <fairmq/PropertyOutput.h> #include <fairmq/PropertyOutput.h>
#include <algorithm> #include <algorithm>
#include <utility> // move
struct MyClass struct MyClass
{ {
MyClass() = default; MyClass() = default;
MyClass(const std::string& a) : msg(a) {} MyClass(std::string a) : msg(std::move(a)) {}
MyClass(const MyClass&) = default; MyClass(const MyClass&) = default;
MyClass& operator=(const MyClass& b) = default; MyClass& operator=(const MyClass& b) = default;
std::string msg; std::string msg;