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

12
fairmq/zeromq/FairMQContextZMQ.cxx
View File

@@ -13,16 +13,12 @@ FairMQContextZMQ::FairMQContextZMQ(int numIoThreads)
{
fContext = zmq_ctx_new ();
if (fContext == NULL){
stringstream logmsg;
logmsg << "failed creating context, reason: " << zmq_strerror(errno);
FairMQLogger::GetInstance()->Log(FairMQLogger::ERROR, logmsg.str());
LOG(ERROR) << "failed creating context, reason: " << zmq_strerror(errno);
}
int rc = zmq_ctx_set (fContext, ZMQ_IO_THREADS, numIoThreads);
if (rc != 0){
stringstream logmsg;
logmsg << "failed configuring context, reason: " << zmq_strerror(errno);
FairMQLogger::GetInstance()->Log(FairMQLogger::ERROR, logmsg.str());
LOG(ERROR) << "failed configuring context, reason: " << zmq_strerror(errno);
}
}
@@ -44,9 +40,7 @@ void FairMQContextZMQ::Close()
int rc = zmq_ctx_destroy (fContext);
if (rc != 0) {
stringstream logmsg;
logmsg << "failed closing context, reason: " << zmq_strerror(errno);
FairMQLogger::GetInstance()->Log(FairMQLogger::ERROR, logmsg.str());
LOG(ERROR) << "failed closing context, reason: " << zmq_strerror(errno);
}
fContext = NULL;

36
fairmq/zeromq/FairMQMessageZMQ.cxx
View File

@@ -16,9 +16,7 @@ FairMQMessageZMQ::FairMQMessageZMQ() :
{
int rc = zmq_msg_init (fMessage);
if (rc != 0) {
stringstream logmsg;
logmsg << "failed initializing message, reason: " << zmq_strerror(errno);
FairMQLogger::GetInstance()->Log(FairMQLogger::ERROR, logmsg.str());
LOG(ERROR) << "failed initializing message, reason: " << zmq_strerror(errno);
}
}
@@ -27,9 +25,7 @@ FairMQMessageZMQ::FairMQMessageZMQ(size_t size) :
{
int rc = zmq_msg_init_size (fMessage, size);
if (rc != 0) {
stringstream logmsg;
logmsg << "failed initializing message with size, reason: " << zmq_strerror(errno);
FairMQLogger::GetInstance()->Log(FairMQLogger::ERROR, logmsg.str());
LOG(ERROR) << "failed initializing message with size, reason: " << zmq_strerror(errno);
}
}
@@ -38,9 +34,7 @@ FairMQMessageZMQ::FairMQMessageZMQ(void* data, size_t size) :
{
int rc = zmq_msg_init_data (fMessage, data, size, &CleanUp, NULL);
if (rc != 0) {
stringstream logmsg;
logmsg << "failed initializing message with data, reason: " << zmq_strerror(errno);
FairMQLogger::GetInstance()->Log(FairMQLogger::ERROR, logmsg.str());
LOG(ERROR) << "failed initializing message with data, reason: " << zmq_strerror(errno);
}
}
@@ -49,9 +43,7 @@ void FairMQMessageZMQ::Rebuild()
CloseMessage();
int rc = zmq_msg_init (fMessage);
if (rc != 0) {
stringstream logmsg;
logmsg << "failed initializing message, reason: " << zmq_strerror(errno);
FairMQLogger::GetInstance()->Log(FairMQLogger::ERROR, logmsg.str());
LOG(ERROR) << "failed initializing message, reason: " << zmq_strerror(errno);
}
}
@@ -60,9 +52,7 @@ void FairMQMessageZMQ::Rebuild(size_t size)
CloseMessage();
int rc = zmq_msg_init_size (fMessage, size);
if (rc != 0) {
stringstream logmsg;
logmsg << "failed initializing message with size, reason: " << zmq_strerror(errno);
FairMQLogger::GetInstance()->Log(FairMQLogger::ERROR, logmsg.str());
LOG(ERROR) << "failed initializing message with size, reason: " << zmq_strerror(errno);
}
}
@@ -71,9 +61,7 @@ void FairMQMessageZMQ::Rebuild(void* data, size_t size)
CloseMessage();
int rc = zmq_msg_init_data (fMessage, data, size, &CleanUp, NULL);
if (rc != 0) {
stringstream logmsg;
logmsg << "failed initializing message with data, reason: " << zmq_strerror(errno);
FairMQLogger::GetInstance()->Log(FairMQLogger::ERROR, logmsg.str());
LOG(ERROR) << "failed initializing message with data, reason: " << zmq_strerror(errno);
}
}
@@ -101,9 +89,7 @@ inline void FairMQMessageZMQ::CloseMessage()
{
int rc = zmq_msg_close (fMessage);
if (rc != 0) {
stringstream logmsg;
logmsg << "failed closing message, reason: " << zmq_strerror(errno);
FairMQLogger::GetInstance()->Log(FairMQLogger::ERROR, logmsg.str());
LOG(ERROR) << "failed closing message, reason: " << zmq_strerror(errno);
}
}
@@ -111,9 +97,7 @@ void FairMQMessageZMQ::Copy(FairMQMessage* msg)
{
int rc = zmq_msg_copy (fMessage, (static_cast<FairMQMessageZMQ*>(msg)->fMessage));
if (rc != 0) {
stringstream logmsg;
logmsg << "failed copying message, reason: " << zmq_strerror(errno);
FairMQLogger::GetInstance()->Log(FairMQLogger::ERROR, logmsg.str());
LOG(ERROR) << "failed copying message, reason: " << zmq_strerror(errno);
}
}
@@ -126,8 +110,6 @@ FairMQMessageZMQ::~FairMQMessageZMQ()
{
int rc = zmq_msg_close (fMessage);
if (rc != 0) {
stringstream logmsg;
logmsg << "failed closing message with data, reason: " << zmq_strerror(errno);
FairMQLogger::GetInstance()->Log(FairMQLogger::ERROR, logmsg.str());
LOG(ERROR) << "failed closing message with data, reason: " << zmq_strerror(errno);
}
}

47
fairmq/zeromq/FairMQSocketZMQ.cxx
View File

@@ -18,30 +18,25 @@ FairMQSocketZMQ::FairMQSocketZMQ(const string& type, int num) :
fMessagesTx(0),
fMessagesRx(0)
{
stringstream id; // TODO
stringstream id;
id << type << "." << num;
fId = id.str();
fSocket = zmq_socket(fContext->GetContext(), GetConstant(type));
int rc = zmq_setsockopt(fSocket, ZMQ_IDENTITY, &fId, fId.length());
if (rc != 0) {
stringstream logmsg;
logmsg << "failed setting socket option, reason: " << zmq_strerror(errno);
FairMQLogger::GetInstance()->Log(FairMQLogger::ERROR, logmsg.str());
LOG(ERROR) << "failed setting socket option, reason: " << zmq_strerror(errno);
}
if (type == "sub") {
rc = zmq_setsockopt(fSocket, ZMQ_SUBSCRIBE, NULL, 0);
if (rc != 0) {
stringstream logmsg2;
logmsg2 << "failed setting socket option, reason: " << zmq_strerror(errno);
FairMQLogger::GetInstance()->Log(FairMQLogger::ERROR, logmsg2.str());
LOG(ERROR) << "failed setting socket option, reason: " << zmq_strerror(errno);
}
}
stringstream logmsg3;
logmsg3 << "created socket #" << fId;
FairMQLogger::GetInstance()->Log(FairMQLogger::INFO, logmsg3.str());
LOG(INFO) << "created socket #" << fId;
}
string FairMQSocketZMQ::GetId()
@@ -51,29 +46,21 @@ string FairMQSocketZMQ::GetId()
void FairMQSocketZMQ::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 rc = zmq_bind (fSocket, address.c_str());
if (rc != 0) {
stringstream logmsg2;
logmsg2 << "failed binding socket #" << fId << ", reason: " << zmq_strerror(errno);
FairMQLogger::GetInstance()->Log(FairMQLogger::ERROR, logmsg2.str());
LOG(ERROR) << "failed binding socket #" << fId << ", reason: " << zmq_strerror(errno);
}
}
void FairMQSocketZMQ::Connect(const string& address)
{
stringstream logmsg;
logmsg << "connect socket #" << fId << " on " << address;
FairMQLogger::GetInstance()->Log(FairMQLogger::INFO, logmsg.str());
LOG(INFO) << "connect socket #" << fId << " on " << address;
int rc = zmq_connect (fSocket, address.c_str());
if (rc != 0) {
stringstream logmsg2;
logmsg2 << "failed connecting socket #" << fId << ", reason: " << zmq_strerror(errno);
FairMQLogger::GetInstance()->Log(FairMQLogger::ERROR, logmsg2.str());
LOG(ERROR) << "failed connecting socket #" << fId << ", reason: " << zmq_strerror(errno);
}
}
@@ -88,9 +75,7 @@ size_t FairMQSocketZMQ::Send(FairMQMessage* msg)
if (zmq_errno() == EAGAIN){
return false;
}
stringstream logmsg;
logmsg << "failed sending on socket #" << fId << ", reason: " << zmq_strerror(errno);
FairMQLogger::GetInstance()->Log(FairMQLogger::ERROR, logmsg.str());
LOG(ERROR) << "failed sending on socket #" << fId << ", reason: " << zmq_strerror(errno);
return nbytes;
}
@@ -105,9 +90,7 @@ size_t FairMQSocketZMQ::Receive(FairMQMessage* msg)
if (zmq_errno() == EAGAIN){
return false;
}
stringstream logmsg;
logmsg << "failed receiving on socket #" << fId << ", reason: " << zmq_strerror(errno);
FairMQLogger::GetInstance()->Log(FairMQLogger::ERROR, logmsg.str());
LOG(ERROR) << "failed receiving on socket #" << fId << ", reason: " << zmq_strerror(errno);
return nbytes;
}
@@ -119,9 +102,7 @@ void FairMQSocketZMQ::Close()
int rc = zmq_close (fSocket);
if (rc != 0) {
stringstream logmsg;
logmsg << "failed closing socket, reason: " << zmq_strerror(errno);
FairMQLogger::GetInstance()->Log(FairMQLogger::ERROR, logmsg.str());
LOG(ERROR) << "failed closing socket, reason: " << zmq_strerror(errno);
}
fSocket = NULL;
@@ -142,9 +123,7 @@ void FairMQSocketZMQ::SetOption(const string& option, const void* value, size_t
{
int rc = zmq_setsockopt(fSocket, GetConstant(option), value, valueSize);
if (rc < 0) {
stringstream logmsg;
logmsg << "failed setting socket option, reason: " << zmq_strerror(errno);
FairMQLogger::GetInstance()->Log(FairMQLogger::ERROR, logmsg.str());
LOG(ERROR) << "failed setting socket option, reason: " << zmq_strerror(errno);
}
}

2
fairmq/zeromq/FairMQTransportFactoryZMQ.cxx
View File

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

4
fairmq/zeromq/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 FairMQTransportFactoryZMQ();
sampler.SetTransport(transportFactory);

4
fairmq/zeromq/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 FairMQTransportFactoryZMQ();
buffer.SetTransport(transportFactory);

4
fairmq/zeromq/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 FairMQTransportFactoryZMQ();
merger.SetTransport(transportFactory);

4
fairmq/zeromq/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 FairMQTransportFactoryZMQ();
merger.SetTransport(transportFactory);

4
fairmq/zeromq/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 FairMQTransportFactoryZMQ();
splitter.SetTransport(transportFactory);

4
fairmq/zeromq/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 FairMQTransportFactoryZMQ();
proxy.SetTransport(transportFactory);

4
fairmq/zeromq/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 FairMQTransportFactoryZMQ();
sink.SetTransport(transportFactory);

4
fairmq/zeromq/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 FairMQTransportFactoryZMQ();
splitter.SetTransport(transportFactory);