diff --git a/fairmq/FairMQDevice.cxx b/fairmq/FairMQDevice.cxx index 6d389eb1..0acf4c5e 100644 --- a/fairmq/FairMQDevice.cxx +++ b/fairmq/FairMQDevice.cxx @@ -23,80 +23,96 @@ FairMQDevice::FairMQDevice() void FairMQDevice::Init() { - LOG(INFO) << ">>>>>>> Init <<<<<<<"; - LOG(INFO) << "numIoThreads: " << fNumIoThreads; + LOG(INFO) << ">>>>>>> Init <<<<<<<"; + LOG(INFO) << "numIoThreads: " << fNumIoThreads; - fInputAddress = new vector(fNumInputs); - fInputMethod = new vector(); - fInputSocketType = new vector(); - fInputSndBufSize = new vector(); - fInputRcvBufSize = new vector(); + fInputAddress = new vector(fNumInputs); + fInputMethod = new vector(); + fInputSocketType = new vector(); + fInputSndBufSize = new vector(); + fInputRcvBufSize = new vector(); - for (int i = 0; i < fNumInputs; ++i) { - fInputMethod->push_back("connect"); // default value, can be overwritten in configuration - fInputSocketType->push_back("sub"); // default value, can be overwritten in configuration - fInputSndBufSize->push_back(10000); // default value, can be overwritten in configuration - fInputRcvBufSize->push_back(10000); // default value, can be overwritten in configuration - } + for (int i = 0; i < fNumInputs; ++i) + { + fInputMethod->push_back("connect"); // default value, can be overwritten in configuration + fInputSocketType->push_back("sub"); // default value, can be overwritten in configuration + fInputSndBufSize->push_back(10000); // default value, can be overwritten in configuration + fInputRcvBufSize->push_back(10000); // default value, can be overwritten in configuration + } - fOutputAddress = new vector(fNumOutputs); - fOutputMethod = new vector(); - fOutputSocketType = new vector(); - fOutputSndBufSize = new vector(); - fOutputRcvBufSize = new vector(); + fOutputAddress = new vector(fNumOutputs); + fOutputMethod = new vector(); + fOutputSocketType = new vector(); + fOutputSndBufSize = new vector(); + fOutputRcvBufSize = new vector(); - for (int i = 0; i < fNumOutputs; ++i) { - fOutputMethod->push_back("bind"); // default value, can be overwritten in configuration - fOutputSocketType->push_back("pub"); // default value, can be overwritten in configuration - fOutputSndBufSize->push_back(10000); // default value, can be overwritten in configuration - fOutputRcvBufSize->push_back(10000); // default value, can be overwritten in configuration - } + for (int i = 0; i < fNumOutputs; ++i) + { + fOutputMethod->push_back("bind"); // default value, can be overwritten in configuration + fOutputSocketType->push_back("pub"); // default value, can be overwritten in configuration + fOutputSndBufSize->push_back(10000); // default value, can be overwritten in configuration + fOutputRcvBufSize->push_back(10000); // default value, can be overwritten in configuration + } } void FairMQDevice::InitInput() { - LOG(INFO) << ">>>>>>> InitInput <<<<<<<"; + LOG(INFO) << ">>>>>>> InitInput <<<<<<<"; - for (int i = 0; i < fNumInputs; ++i) { - FairMQSocket* socket = fTransportFactory->CreateSocket(fInputSocketType->at(i), i, fNumIoThreads); + for (int i = 0; i < fNumInputs; ++i) + { + FairMQSocket* socket = fTransportFactory->CreateSocket(fInputSocketType->at(i), i, fNumIoThreads); - socket->SetOption("snd-hwm", &fInputSndBufSize->at(i), sizeof(fInputSndBufSize->at(i))); - socket->SetOption("rcv-hwm", &fInputRcvBufSize->at(i), sizeof(fInputRcvBufSize->at(i))); + socket->SetOption("snd-hwm", &fInputSndBufSize->at(i), sizeof(fInputSndBufSize->at(i))); + socket->SetOption("rcv-hwm", &fInputRcvBufSize->at(i), sizeof(fInputRcvBufSize->at(i))); - fPayloadInputs->push_back(socket); + fPayloadInputs->push_back(socket); - try { - if (fInputMethod->at(i) == "bind") { - fPayloadInputs->at(i)->Bind(fInputAddress->at(i)); - } else { - fPayloadInputs->at(i)->Connect(fInputAddress->at(i)); - } - } catch (std::out_of_range& e) { + try + { + if (fInputMethod->at(i) == "bind") + { + fPayloadInputs->at(i)->Bind(fInputAddress->at(i)); + } + else + { + fPayloadInputs->at(i)->Connect(fInputAddress->at(i)); + } + } + catch (std::out_of_range& e) + { + } } - } } void FairMQDevice::InitOutput() { - LOG(INFO) << ">>>>>>> InitOutput <<<<<<<"; + LOG(INFO) << ">>>>>>> InitOutput <<<<<<<"; - for (int i = 0; i < fNumOutputs; ++i) { - FairMQSocket* socket = fTransportFactory->CreateSocket(fOutputSocketType->at(i), i, fNumIoThreads); + for (int i = 0; i < fNumOutputs; ++i) + { + FairMQSocket* socket = fTransportFactory->CreateSocket(fOutputSocketType->at(i), i, fNumIoThreads); - socket->SetOption("snd-hwm", &fOutputSndBufSize->at(i), sizeof(fOutputSndBufSize->at(i))); - socket->SetOption("rcv-hwm", &fOutputRcvBufSize->at(i), sizeof(fOutputRcvBufSize->at(i))); + socket->SetOption("snd-hwm", &fOutputSndBufSize->at(i), sizeof(fOutputSndBufSize->at(i))); + socket->SetOption("rcv-hwm", &fOutputRcvBufSize->at(i), sizeof(fOutputRcvBufSize->at(i))); - fPayloadOutputs->push_back(socket); + fPayloadOutputs->push_back(socket); - try { - if (fOutputMethod->at(i) == "bind") { - fPayloadOutputs->at(i)->Bind(fOutputAddress->at(i)); - } else { - fPayloadOutputs->at(i)->Connect(fOutputAddress->at(i)); - } - } catch (std::out_of_range& e) { + try + { + if (fOutputMethod->at(i) == "bind") + { + fPayloadOutputs->at(i)->Bind(fOutputAddress->at(i)); + } + else + { + fPayloadOutputs->at(i)->Connect(fOutputAddress->at(i)); + } + } + catch (std::out_of_range& e) + { + } } - } } void FairMQDevice::Run() diff --git a/fairmq/FairMQStateMachine.h b/fairmq/FairMQStateMachine.h index 70177663..5c75fa55 100644 --- a/fairmq/FairMQStateMachine.h +++ b/fairmq/FairMQStateMachine.h @@ -169,18 +169,18 @@ namespace FairMQFSM } // Transition table for FairMQFMS struct transition_table : mpl::vector< - // Start Event Next Action Guard - // +---------+---------+-------+---------+--------+ - msmf::Row, - msmf::Row, // this is an invalid transition... - msmf::Row, - msmf::Row, - msmf::Row, - msmf::Row, - msmf::Row, - msmf::Row, - msmf::Row, - msmf::Row > + // Start Event Next Action Guard + // +---------+---------+-------+---------+--------+ + msmf::Row, + msmf::Row, // this is an invalid transition... + msmf::Row, + msmf::Row, + msmf::Row, + msmf::Row, + msmf::Row, + msmf::Row, + msmf::Row, + msmf::Row > { }; // Replaces the default no-transition response. diff --git a/fairmq/apply-clang-format.sh b/fairmq/apply-clang-format.sh index a9103ac3..055fddc9 100755 --- a/fairmq/apply-clang-format.sh +++ b/fairmq/apply-clang-format.sh @@ -1,3 +1,3 @@ #!/bin/bash -find . -type f \( -iname "*.h" ! -iname "*.pb.h" -o -iname "*.cxx" \) -execdir clang-format -i {} \; +find . -type f \( -iname "*.h" ! -iname "*.pb.h" ! -iname "*LinkDef.h" -o -iname "*.cxx" -o -iname "*.tpl" \) -execdir clang-format -i {} \; diff --git a/fairmq/nanomsg/FairMQSocketNN.cxx b/fairmq/nanomsg/FairMQSocketNN.cxx index 2a364fc7..8e45012d 100644 --- a/fairmq/nanomsg/FairMQSocketNN.cxx +++ b/fairmq/nanomsg/FairMQSocketNN.cxx @@ -11,24 +11,26 @@ #include "FairMQMessageNN.h" #include "FairMQLogger.h" -FairMQSocketNN::FairMQSocketNN(const string& type, int num, int numIoThreads) : - fBytesTx(0), - fBytesRx(0), - fMessagesTx(0), - fMessagesRx(0) +FairMQSocketNN::FairMQSocketNN(const string& type, int num, int numIoThreads) + : fBytesTx(0) + , fBytesRx(0) + , fMessagesTx(0) + , fMessagesRx(0) { stringstream id; id << type << "." << num; fId = id.str(); - if ( numIoThreads > 1 ) { - LOG(INFO) << "number of I/O threads is not used in nanomsg"; - } + if (numIoThreads > 1) + { + LOG(INFO) << "number of I/O threads is not used in nanomsg"; + } - fSocket = nn_socket (AF_SP, GetConstant(type)); - if (type == "sub") { - nn_setsockopt(fSocket, NN_SUB, NN_SUB_SUBSCRIBE, NULL, 0); - } + fSocket = nn_socket(AF_SP, GetConstant(type)); + if (type == "sub") + { + nn_setsockopt(fSocket, NN_SUB, NN_SUB_SUBSCRIBE, NULL, 0); + } LOG(INFO) << "created socket #" << fId; } diff --git a/fairmq/nanomsg/FairMQTransportFactoryNN.cxx b/fairmq/nanomsg/FairMQTransportFactoryNN.cxx index bd97e15d..c9ccd6ac 100644 --- a/fairmq/nanomsg/FairMQTransportFactoryNN.cxx +++ b/fairmq/nanomsg/FairMQTransportFactoryNN.cxx @@ -29,7 +29,7 @@ FairMQMessage* FairMQTransportFactoryNN::CreateMessage(void* data, size_t size) FairMQSocket* FairMQTransportFactoryNN::CreateSocket(const string& type, int num, int numIoThreads) { - return new FairMQSocketNN(type, num, numIoThreads); + return new FairMQSocketNN(type, num, numIoThreads); } FairMQPoller* FairMQTransportFactoryNN::CreatePoller(const vector& inputs) diff --git a/fairmq/zeromq/FairMQSocketZMQ.cxx b/fairmq/zeromq/FairMQSocketZMQ.cxx index 963f7d46..e9e60a3a 100644 --- a/fairmq/zeromq/FairMQSocketZMQ.cxx +++ b/fairmq/zeromq/FairMQSocketZMQ.cxx @@ -12,36 +12,40 @@ boost::shared_ptr FairMQSocketZMQ::fContext = boost::shared_ptr(new FairMQContextZMQ(1)); -FairMQSocketZMQ::FairMQSocketZMQ(const string& type, int num, int numIoThreads) : - fBytesTx(0), - fBytesRx(0), - fMessagesTx(0), - fMessagesRx(0) +FairMQSocketZMQ::FairMQSocketZMQ(const string& type, int num, int numIoThreads) + : fBytesTx(0) + , fBytesRx(0) + , fMessagesTx(0) + , fMessagesRx(0) { - stringstream id; - id << type << "." << num; - fId = id.str(); + stringstream id; + id << type << "." << num; + fId = id.str(); - int rc = zmq_ctx_set (fContext->GetContext(), ZMQ_IO_THREADS, numIoThreads); - if (rc != 0){ - LOG(ERROR) << "failed configuring context, reason: " << zmq_strerror(errno); - } - - fSocket = zmq_socket(fContext->GetContext(), GetConstant(type)); - - rc = zmq_setsockopt(fSocket, ZMQ_IDENTITY, &fId, fId.length()); - 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); + int rc = zmq_ctx_set(fContext->GetContext(), ZMQ_IO_THREADS, numIoThreads); + if (rc != 0) + { + LOG(ERROR) << "failed configuring context, reason: " << zmq_strerror(errno); } - } - LOG(INFO) << "created socket #" << fId; + fSocket = zmq_socket(fContext->GetContext(), GetConstant(type)); + + rc = zmq_setsockopt(fSocket, ZMQ_IDENTITY, &fId, fId.length()); + 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; } string FairMQSocketZMQ::GetId() diff --git a/fairmq/zeromq/FairMQTransportFactoryZMQ.cxx b/fairmq/zeromq/FairMQTransportFactoryZMQ.cxx index d1a645d4..eb86a5ee 100644 --- a/fairmq/zeromq/FairMQTransportFactoryZMQ.cxx +++ b/fairmq/zeromq/FairMQTransportFactoryZMQ.cxx @@ -33,7 +33,7 @@ FairMQMessage* FairMQTransportFactoryZMQ::CreateMessage(void* data, size_t size) FairMQSocket* FairMQTransportFactoryZMQ::CreateSocket(const string& type, int num, int numIoThreads) { - return new FairMQSocketZMQ(type, num, numIoThreads); + return new FairMQSocketZMQ(type, num, numIoThreads); } FairMQPoller* FairMQTransportFactoryZMQ::CreatePoller(const vector& inputs)