Mirror/FairMQ
1
0
Fork 0
mirror of https://github.com/FairRootGroup/FairMQ.git synced 2025-10-15 17:41:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Apply modernize-pass-by-value

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

14
fairmq/FairMQChannel.cxx
View File

@@ -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<FairMQTransportFactory> factory)
FairMQChannel::FairMQChannel(string name, string type, string method, string address, shared_ptr<FairMQTransportFactory> 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)

4
fairmq/FairMQChannel.h
View File

@@ -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<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);
@@ -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;

4
fairmq/FairMQDevice.cxx
View File

@@ -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);

5
fairmq/FairMQTransportFactory.cxx
View File

@@ -20,11 +20,12 @@
#include <memory>
#include <string>
#include <utility> // 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,

2
fairmq/FairMQTransportFactory.h
View File

@@ -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; };

27
fairmq/sdk/commands/Commands.h
View File

@@ -16,6 +16,7 @@
#include <memory>
#include <type_traits>
#include <stdexcept>
#include <utility> // 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)

4
fairmq/shmem/Monitor.cxx
View File

@@ -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)

2
fairmq/shmem/Monitor.h
View File

@@ -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;

5
fairmq/shmem/Region.h
View File

@@ -38,6 +38,7 @@
#include <cerrno>
#include <chrono>
#include <ios>
#include <utility> // 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;

5
fairmq/zeromq/UnmanagedRegion.h
View File

@@ -15,6 +15,7 @@
#include <cstddef> // size_t
#include <string>
#include <utility> // move
#include <sys/mman.h> // 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 << "...";