change argument passing by value/reference

This commit is contained in:
Alexey Rybalchenko 2014-01-27 16:51:23 +01:00
parent ee70113120
commit b45f968c67
12 changed files with 22 additions and 26 deletions

View File

@ -113,7 +113,7 @@ void FairMQBenchmarkSampler::Log(int intervalInMs)
} }
} }
void FairMQBenchmarkSampler::SetProperty(const int& key, const string& value, const int& slot/*= 0*/) void FairMQBenchmarkSampler::SetProperty(const int key, const string& value, const int slot/*= 0*/)
{ {
switch (key) { switch (key) {
default: default:
@ -122,7 +122,7 @@ void FairMQBenchmarkSampler::SetProperty(const int& key, const string& value, co
} }
} }
string FairMQBenchmarkSampler::GetProperty(const int& key, const string& default_/*= ""*/, const int& slot/*= 0*/) string FairMQBenchmarkSampler::GetProperty(const int key, const string& default_/*= ""*/, const int slot/*= 0*/)
{ {
switch (key) { switch (key) {
default: default:
@ -130,7 +130,7 @@ string FairMQBenchmarkSampler::GetProperty(const int& key, const string& default
} }
} }
void FairMQBenchmarkSampler::SetProperty(const int& key, const int& value, const int& slot/*= 0*/) void FairMQBenchmarkSampler::SetProperty(const int key, const int value, const int slot/*= 0*/)
{ {
switch (key) { switch (key) {
case EventSize: case EventSize:
@ -145,7 +145,7 @@ void FairMQBenchmarkSampler::SetProperty(const int& key, const int& value, const
} }
} }
int FairMQBenchmarkSampler::GetProperty(const int& key, const int& default_/*= 0*/, const int& slot/*= 0*/) int FairMQBenchmarkSampler::GetProperty(const int key, const int default_/*= 0*/, const int slot/*= 0*/)
{ {
switch (key) { switch (key) {
case EventSize: case EventSize:
@ -156,4 +156,3 @@ int FairMQBenchmarkSampler::GetProperty(const int& key, const int& default_/*= 0
return FairMQDevice::GetProperty(key, default_, slot); return FairMQDevice::GetProperty(key, default_, slot);
} }
} }

View File

@ -29,10 +29,10 @@ class FairMQBenchmarkSampler: public FairMQDevice
virtual ~FairMQBenchmarkSampler(); virtual ~FairMQBenchmarkSampler();
void Log(int intervalInMs); void Log(int intervalInMs);
void ResetEventCounter(); void ResetEventCounter();
virtual void SetProperty(const int& key, const string& value, const int& slot = 0); virtual void SetProperty(const int key, const string& value, const int slot = 0);
virtual string GetProperty(const int& key, const string& default_ = "", const int& slot = 0); virtual string GetProperty(const int key, const string& default_ = "", const int slot = 0);
virtual void SetProperty(const int& key, const int& value, const int& slot = 0); virtual void SetProperty(const int key, const int value, const int slot = 0);
virtual int GetProperty(const int& key, const int& default_ = 0, const int& slot = 0); virtual int GetProperty(const int key, const int default_ = 0, const int slot = 0);
protected: protected:
int fEventSize; int fEventSize;
int fEventRate; int fEventRate;

View File

@ -33,5 +33,3 @@ int FairMQConfigurable::GetProperty(const int key, const int default_/*= 0*/, co
FairMQConfigurable::~FairMQConfigurable() FairMQConfigurable::~FairMQConfigurable()
{ {
} }

View File

@ -24,8 +24,6 @@ class FairMQConfigurable
virtual void SetProperty(const int key, const int value, const int slot = 0); virtual void SetProperty(const int key, const int value, const int slot = 0);
virtual int GetProperty(const int key, const int default_ = 0, const int slot = 0); virtual int GetProperty(const int key, const int default_ = 0, const int slot = 0);
virtual ~FairMQConfigurable(); virtual ~FairMQConfigurable();
// TODO: by value for integers
}; };
#endif /* FAIRMQCONFIGURABLE_H_ */ #endif /* FAIRMQCONFIGURABLE_H_ */

View File

@ -161,7 +161,7 @@ void FairMQSampler::ListenToCommands()
FairMQLogger::GetInstance()->Log(FairMQLogger::DEBUG, ">>>>>>> stopping commandListener <<<<<<<"); FairMQLogger::GetInstance()->Log(FairMQLogger::DEBUG, ">>>>>>> stopping commandListener <<<<<<<");
} }
void FairMQSampler::SetProperty(const int& key, const string& value, const int& slot/*= 0*/) void FairMQSampler::SetProperty(const int key, const string& value, const int slot/*= 0*/)
{ {
switch (key) { switch (key) {
case InputFile: case InputFile:
@ -179,7 +179,7 @@ void FairMQSampler::SetProperty(const int& key, const string& value, const int&
} }
} }
string FairMQSampler::GetProperty(const int& key, const string& default_/*= ""*/, const int& slot/*= 0*/) string FairMQSampler::GetProperty(const int key, const string& default_/*= ""*/, const int slot/*= 0*/)
{ {
switch (key) { switch (key) {
case InputFile: case InputFile:
@ -193,7 +193,7 @@ string FairMQSampler::GetProperty(const int& key, const string& default_/*= ""*/
} }
} }
void FairMQSampler::SetProperty(const int& key, const int& value, const int& slot/*= 0*/) void FairMQSampler::SetProperty(const int key, const int value, const int slot/*= 0*/)
{ {
switch (key) { switch (key) {
case EventRate: case EventRate:
@ -205,7 +205,7 @@ void FairMQSampler::SetProperty(const int& key, const int& value, const int& slo
} }
} }
int FairMQSampler::GetProperty(const int& key, const int& default_/*= 0*/, const int& slot/*= 0*/) int FairMQSampler::GetProperty(const int key, const int default_/*= 0*/, const int slot/*= 0*/)
{ {
switch (key) { switch (key) {
case EventRate: case EventRate:

View File

@ -39,10 +39,10 @@ class FairMQSampler: public FairMQDevice
void ResetEventCounter(); void ResetEventCounter();
virtual void ListenToCommands(); virtual void ListenToCommands();
virtual void SetProperty(const int& key, const string& value, const int& slot = 0); virtual void SetProperty(const int key, const string& value, const int slot = 0);
virtual string GetProperty(const int& key, const string& default_ = "", const int& slot = 0); virtual string GetProperty(const int key, const string& default_ = "", const int slot = 0);
virtual void SetProperty(const int& key, const int& value, const int& slot = 0); virtual void SetProperty(const int key, const int value, const int slot = 0);
virtual int GetProperty(const int& key, const int& default_ = 0, const int& slot = 0); virtual int GetProperty(const int key, const int default_ = 0, const int slot = 0);
protected: protected:
FairRunAna* fFairRunAna; FairRunAna* fFairRunAna;
int fNumEvents; int fNumEvents;

View File

@ -135,6 +135,7 @@ void* FairMQSocketZMQ::GetSocket()
int FairMQSocketZMQ::GetSocket(int nothing) int FairMQSocketZMQ::GetSocket(int nothing)
{ {
// dummy method to compy with the interface. functionality not possible in zeromq. // dummy method to compy with the interface. functionality not possible in zeromq.
return -1;
} }
void FairMQSocketZMQ::SetOption(const string& option, const void* value, size_t valueSize) void FairMQSocketZMQ::SetOption(const string& option, const void* value, size_t valueSize)

View File

@ -22,7 +22,7 @@ class FairMQTransportFactory
virtual FairMQMessage* CreateMessage() = 0; virtual FairMQMessage* CreateMessage() = 0;
virtual FairMQMessage* CreateMessage(size_t size) = 0; virtual FairMQMessage* CreateMessage(size_t size) = 0;
virtual FairMQMessage* CreateMessage(void* data, size_t size) = 0; virtual FairMQMessage* CreateMessage(void* data, size_t size) = 0;
virtual FairMQSocket* CreateSocket(string type, int num) = 0; virtual FairMQSocket* CreateSocket(const string& type, int num) = 0;
virtual FairMQPoller* CreatePoller(const vector<FairMQSocket*>& inputs) = 0; virtual FairMQPoller* CreatePoller(const vector<FairMQSocket*>& inputs) = 0;
virtual ~FairMQTransportFactory() {}; virtual ~FairMQTransportFactory() {};

View File

@ -27,7 +27,7 @@ FairMQMessage* FairMQTransportFactoryNN::CreateMessage(void* data, size_t size)
return new FairMQMessageNN(data, size); return new FairMQMessageNN(data, size);
} }
FairMQSocket* FairMQTransportFactoryNN::CreateSocket(string type, int num) FairMQSocket* FairMQTransportFactoryNN::CreateSocket(const string& type, int num)
{ {
return new FairMQSocketNN(type, num); return new FairMQSocketNN(type, num);
} }

View File

@ -23,7 +23,7 @@ class FairMQTransportFactoryNN : public FairMQTransportFactory
virtual FairMQMessage* CreateMessage(); virtual FairMQMessage* CreateMessage();
virtual FairMQMessage* CreateMessage(size_t size); virtual FairMQMessage* CreateMessage(size_t size);
virtual FairMQMessage* CreateMessage(void* data, size_t size); virtual FairMQMessage* CreateMessage(void* data, size_t size);
virtual FairMQSocket* CreateSocket(string type, int num); virtual FairMQSocket* CreateSocket(const string& type, int num);
virtual FairMQPoller* CreatePoller(const vector<FairMQSocket*>& inputs); virtual FairMQPoller* CreatePoller(const vector<FairMQSocket*>& inputs);

View File

@ -27,7 +27,7 @@ FairMQMessage* FairMQTransportFactoryZMQ::CreateMessage(void* data, size_t size)
return new FairMQMessageZMQ(data, size); return new FairMQMessageZMQ(data, size);
} }
FairMQSocket* FairMQTransportFactoryZMQ::CreateSocket(string type, int num) FairMQSocket* FairMQTransportFactoryZMQ::CreateSocket(const string& type, int num)
{ {
return new FairMQSocketZMQ(type, num); return new FairMQSocketZMQ(type, num);
} }

View File

@ -24,7 +24,7 @@ class FairMQTransportFactoryZMQ : public FairMQTransportFactory
virtual FairMQMessage* CreateMessage(); virtual FairMQMessage* CreateMessage();
virtual FairMQMessage* CreateMessage(size_t size); virtual FairMQMessage* CreateMessage(size_t size);
virtual FairMQMessage* CreateMessage(void* data, size_t size); virtual FairMQMessage* CreateMessage(void* data, size_t size);
virtual FairMQSocket* CreateSocket(string type, int num); virtual FairMQSocket* CreateSocket(const string& type, int num);
virtual FairMQPoller* CreatePoller(const vector<FairMQSocket*>& inputs); virtual FairMQPoller* CreatePoller(const vector<FairMQSocket*>& inputs);