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

simplify logger for shorter calls and readability

Browse Source
This commit is contained in:
Alexey Rybalchenko
2014-02-10 15:27:59 +01:00
parent 4b8659a654
commit ac8bbf154a
33 changed files with 109 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
fairmq/nanomsg/FairMQMessageNN.cxx
View File

@@ -1,4 +1,4 @@
**D
/**
* FairMQMessageNN.cxx
*
* @since 2013-12-05
@@ -22,9 +22,7 @@ FairMQMessageNN::FairMQMessageNN(size_t size)
{
fMessage = nn_allocmsg(size, 0);
if (!fMessage){
stringstream logmsg;
logmsg << "failed allocating message, reason: " << nn_strerror(errno);
FairMQLogger::GetInstance()->Log(FairMQLogger::ERROR, logmsg.str());
LOG(ERROR) << "failed allocating message, reason: " << nn_strerror(errno);
}
fSize = size;
}
@@ -33,9 +31,7 @@ FairMQMessageNN::FairMQMessageNN(void* data, size_t size)
{
fMessage = nn_allocmsg(size, 0);
if (!fMessage){
stringstream logmsg;
logmsg << "failed allocating message, reason: " << nn_strerror(errno);
FairMQLogger::GetInstance()->Log(FairMQLogger::ERROR, logmsg.str());
LOG(ERROR) << "failed allocating message, reason: " << nn_strerror(errno);
}
memcpy (fMessage, data, size);
fSize = size;
@@ -53,9 +49,7 @@ void FairMQMessageNN::Rebuild(size_t size)
Clear();
fMessage = nn_allocmsg(size, 0);
if (!fMessage){
stringstream logmsg;
logmsg << "failed allocating message, reason: " << nn_strerror(errno);
FairMQLogger::GetInstance()->Log(FairMQLogger::ERROR, logmsg.str());
LOG(ERROR) << "failed allocating message, reason: " << nn_strerror(errno);
}
fSize = size;
}
@@ -65,9 +59,7 @@ void FairMQMessageNN::Rebuild(void* data, size_t size)
Clear();
fMessage = nn_allocmsg(size, 0);
if (!fMessage){
stringstream logmsg;
logmsg << "failed allocating message, reason: " << nn_strerror(errno);
FairMQLogger::GetInstance()->Log(FairMQLogger::ERROR, logmsg.str());
LOG(ERROR) << "failed allocating message, reason: " << nn_strerror(errno);
}
memcpy (fMessage, data, size);
fSize = size;
@@ -99,9 +91,7 @@ void FairMQMessageNN::Copy(FairMQMessage* msg)
if (fMessage){
int rc = nn_freemsg(fMessage);
if ( rc < 0 ){
stringstream logmsg;
logmsg << "failed freeing message, reason: " << nn_strerror(errno);
FairMQLogger::GetInstance()->Log(FairMQLogger::ERROR, logmsg.str());
LOG(ERROR) << "failed freeing message, reason: " << nn_strerror(errno);
}
}
@@ -109,9 +99,7 @@ void FairMQMessageNN::Copy(FairMQMessage* msg)
fMessage = nn_allocmsg(size, 0);
if (!fMessage){
stringstream logmsg;
logmsg << "failed allocating message, reason: " << nn_strerror(errno);
FairMQLogger::GetInstance()->Log(FairMQLogger::ERROR, logmsg.str());
LOG(ERROR) << "failed allocating message, reason: " << nn_strerror(errno);
}
std::memcpy (fMessage, msg->GetMessage(), size);
fSize = size;
@@ -121,9 +109,7 @@ inline void FairMQMessageNN::Clear()
{
int rc = nn_freemsg(fMessage);
if (rc < 0) {
stringstream logmsg;
logmsg << "failed freeing message, reason: " << nn_strerror(errno);
FairMQLogger::GetInstance()->Log(FairMQLogger::ERROR, logmsg.str());
LOG(ERROR) << "failed freeing message, reason: " << nn_strerror(errno);
} else {
fMessage = NULL;
fSize = 0;

32
fairmq/nanomsg/FairMQSocketNN.cxx
View File

@@ -25,9 +25,7 @@ FairMQSocketNN::FairMQSocketNN(const string& type, int num) :
nn_setsockopt(fSocket, NN_SUB, NN_SUB_SUBSCRIBE, NULL, 0);
}
stringstream logmsg;
logmsg << "created socket #" << fId;
FairMQLogger::GetInstance()->Log(FairMQLogger::INFO, logmsg.str());
LOG(INFO) << "created socket #" << fId;
}
string FairMQSocketNN::GetId()
@@ -37,29 +35,21 @@ string FairMQSocketNN::GetId()
void FairMQSocketNN::Bind(const string& address)
{
stringstream logmsg;
logmsg << "bind socket #" << fId << " on " << address;
FairMQLogger::GetInstance()->Log(FairMQLogger::INFO, logmsg.str());
LOG(INFO) << "bind socket #" << fId << " on " << address;
int eid = nn_bind(fSocket, address.c_str());
if (eid < 0) {
stringstream logmsg2;
logmsg2 << "failed binding socket #" << fId << ", reason: " << nn_strerror(errno);
FairMQLogger::GetInstance()->Log(FairMQLogger::ERROR, logmsg2.str());
LOG(ERROR) << "failed binding socket #" << fId << ", reason: " << nn_strerror(errno);
}
}
void FairMQSocketNN::Connect(const string& address)
{
stringstream logmsg;
logmsg << "connect socket #" << fId << " to " << address;
FairMQLogger::GetInstance()->Log(FairMQLogger::INFO, logmsg.str());
LOG(INFO) << "connect socket #" << fId << " to " << address;
int eid = nn_connect(fSocket, address.c_str());
if (eid < 0) {
stringstream logmsg2;
logmsg2 << "failed connecting socket #" << fId << ", reason: " << nn_strerror(errno);
FairMQLogger::GetInstance()->Log(FairMQLogger::ERROR, logmsg2.str());
LOG(ERROR) << "failed connecting socket #" << fId << ", reason: " << nn_strerror(errno);
}
}
@@ -68,9 +58,7 @@ size_t FairMQSocketNN::Send(FairMQMessage* msg)
void* ptr = msg->GetMessage();
int rc = nn_send(fSocket, &ptr, NN_MSG, 0);
if (rc < 0) {
stringstream logmsg;
logmsg << "failed sending on socket #" << fId << ", reason: " << nn_strerror(errno);
FairMQLogger::GetInstance()->Log(FairMQLogger::ERROR, logmsg.str());
LOG(ERROR) << "failed sending on socket #" << fId << ", reason: " << nn_strerror(errno);
} else {
fBytesTx += rc;
++fMessagesTx;
@@ -84,9 +72,7 @@ size_t FairMQSocketNN::Receive(FairMQMessage* msg)
void* ptr = NULL;
int rc = nn_recv(fSocket, &ptr, NN_MSG, 0);
if (rc < 0) {
stringstream logmsg;
logmsg << "failed receiving on socket #" << fId << ", reason: " << nn_strerror(errno);
FairMQLogger::GetInstance()->Log(FairMQLogger::ERROR, logmsg.str());
LOG(ERROR) << "failed receiving on socket #" << fId << ", reason: " << nn_strerror(errno);
} else {
fBytesRx += rc;
++fMessagesRx;
@@ -115,9 +101,7 @@ void FairMQSocketNN::SetOption(const string& option, const void* value, size_t v
{
int rc = nn_setsockopt(fSocket, NN_SOL_SOCKET, GetConstant(option), value, valueSize);
if (rc < 0) {
stringstream logmsg;
logmsg << "failed setting socket option, reason: " << nn_strerror(errno);
FairMQLogger::GetInstance()->Log(FairMQLogger::ERROR, logmsg.str());
LOG(ERROR) << "failed setting socket option, reason: " << nn_strerror(errno);
}
}

2
fairmq/nanomsg/FairMQTransportFactoryNN.cxx
View File

@@ -9,7 +9,7 @@
FairMQTransportFactoryNN::FairMQTransportFactoryNN()
{
FairMQLogger::GetInstance()->Log(FairMQLogger::INFO, "Using nanomsg library");
LOG(INFO) << "Using nanonsg library";
}
FairMQMessage* FairMQTransportFactoryNN::CreateMessage()

4
fairmq/nanomsg/runBenchmarkSampler.cxx
View File

@@ -52,9 +52,7 @@ int main(int argc, char** argv)
s_catch_signals();
stringstream logmsg;
logmsg << "PID: " << getpid();
FairMQLogger::GetInstance()->Log(FairMQLogger::INFO, logmsg.str());
LOG(INFO) << "PID: " << getpid();
FairMQTransportFactory* transportFactory = new FairMQTransportFactoryNN();
sampler.SetTransport(transportFactory);

4
fairmq/nanomsg/runBuffer.cxx
View File

@@ -52,9 +52,7 @@ int main(int argc, char** argv)
s_catch_signals();
stringstream logmsg;
logmsg << "PID: " << getpid();
FairMQLogger::GetInstance()->Log(FairMQLogger::INFO, logmsg.str());
LOG(INFO) << "PID: " << getpid();
FairMQTransportFactory* transportFactory = new FairMQTransportFactoryNN();
buffer.SetTransport(transportFactory);

4
fairmq/nanomsg/runMerger.cxx
View File

@@ -53,9 +53,7 @@ int main(int argc, char** argv)
s_catch_signals();
stringstream logmsg;
logmsg << "PID: " << getpid();
FairMQLogger::GetInstance()->Log(FairMQLogger::INFO, logmsg.str());
LOG(INFO) << "PID: " << getpid();
FairMQTransportFactory* transportFactory = new FairMQTransportFactoryNN();
merger.SetTransport(transportFactory);

4
fairmq/nanomsg/runNToOneMerger.cxx
View File

@@ -55,9 +55,7 @@ int main(int argc, char** argv)
s_catch_signals();
stringstream logmsg;
logmsg << "PID: " << getpid();
FairMQLogger::GetInstance()->Log(FairMQLogger::INFO, logmsg.str());
LOG(INFO) << "PID: " << getpid();
FairMQTransportFactory* transportFactory = new FairMQTransportFactoryNN();
merger.SetTransport(transportFactory);

4
fairmq/nanomsg/runOneToNSplitter.cxx
View File

@@ -54,9 +54,7 @@ int main(int argc, char** argv)
s_catch_signals();
stringstream logmsg;
logmsg << "PID: " << getpid();
FairMQLogger::GetInstance()->Log(FairMQLogger::INFO, logmsg.str());
LOG(INFO) << "PID: " << getpid();
FairMQTransportFactory* transportFactory = new FairMQTransportFactoryNN();
splitter.SetTransport(transportFactory);

4
fairmq/nanomsg/runProxy.cxx
View File

@@ -52,9 +52,7 @@ int main(int argc, char** argv)
s_catch_signals();
stringstream logmsg;
logmsg << "PID: " << getpid();
FairMQLogger::GetInstance()->Log(FairMQLogger::INFO, logmsg.str());
LOG(INFO) << "PID: " << getpid();
FairMQTransportFactory* transportFactory = new FairMQTransportFactoryNN();
proxy.SetTransport(transportFactory);

4
fairmq/nanomsg/runSink.cxx
View File

@@ -52,9 +52,7 @@ int main(int argc, char** argv)
s_catch_signals();
stringstream logmsg;
logmsg << "PID: " << getpid();
FairMQLogger::GetInstance()->Log(FairMQLogger::INFO, logmsg.str());
LOG(INFO) << "PID: " << getpid();
FairMQTransportFactory* transportFactory = new FairMQTransportFactoryNN();
sink.SetTransport(transportFactory);

4
fairmq/nanomsg/runSplitter.cxx
View File

@@ -53,9 +53,7 @@ int main(int argc, char** argv)
s_catch_signals();
stringstream logmsg;
logmsg << "PID: " << getpid();
FairMQLogger::GetInstance()->Log(FairMQLogger::INFO, logmsg.str());
LOG(INFO) << "PID: " << getpid();
FairMQTransportFactory* transportFactory = new FairMQTransportFactoryNN();
splitter.SetTransport(transportFactory);