From 08e603911d11c8e5cfdc480002c2d753f4a7885e Mon Sep 17 00:00:00 2001 From: Alexey Rybalchenko Date: Thu, 5 Jun 2014 11:18:49 +0200 Subject: [PATCH] TMessage transport implemented! --- fairmq/FairMQDevice.cxx | 2 ++ fairmq/zeromq/FairMQSocketZMQ.cxx | 12 ++---------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/fairmq/FairMQDevice.cxx b/fairmq/FairMQDevice.cxx index 7440e63c..6d389eb1 100644 --- a/fairmq/FairMQDevice.cxx +++ b/fairmq/FairMQDevice.cxx @@ -73,6 +73,7 @@ void FairMQDevice::InitInput() } } catch (std::out_of_range& e) { } + } } void FairMQDevice::InitOutput() @@ -95,6 +96,7 @@ void FairMQDevice::InitOutput() } } catch (std::out_of_range& e) { } + } } void FairMQDevice::Run() diff --git a/fairmq/zeromq/FairMQSocketZMQ.cxx b/fairmq/zeromq/FairMQSocketZMQ.cxx index 75a09180..963f7d46 100644 --- a/fairmq/zeromq/FairMQSocketZMQ.cxx +++ b/fairmq/zeromq/FairMQSocketZMQ.cxx @@ -39,17 +39,9 @@ FairMQSocketZMQ::FairMQSocketZMQ(const string& type, int num, int numIoThreads) if (rc != 0) { LOG(ERROR) << "failed setting socket option, reason: " << zmq_strerror(errno); } + } - if (type == "sub") - { - rc = zmq_setsockopt(fSocket, ZMQ_SUBSCRIBE, NULL, 0); - if (rc != 0) - { - LOG(ERROR) << "failed setting socket option, reason: " << zmq_strerror(errno); - } - } - - LOG(INFO) << "created socket #" << fId; + LOG(INFO) << "created socket #" << fId; } string FairMQSocketZMQ::GetId()