diff --git a/examples/1-1/CMakeLists.txt b/examples/1-1/CMakeLists.txt index 882c8815..7ad8a6bd 100644 --- a/examples/1-1/CMakeLists.txt +++ b/examples/1-1/CMakeLists.txt @@ -7,10 +7,10 @@ ################################################################################ add_library(Example11Lib STATIC - "Sampler.cxx" - "Sampler.h" - "Sink.cxx" - "Sink.h" + "Sampler.cxx" + "Sampler.h" + "Sink.cxx" + "Sink.h" ) target_link_libraries(Example11Lib PUBLIC FairMQ) @@ -40,12 +40,12 @@ set_tests_properties(Example.1-1.shmem PROPERTIES TIMEOUT "30" RUN_SERIAL true P # install install( - TARGETS - fairmq-ex-1-1-sampler - fairmq-ex-1-1-sink + TARGETS + fairmq-ex-1-1-sampler + fairmq-ex-1-1-sink - LIBRARY DESTINATION ${PROJECT_INSTALL_LIBDIR} - RUNTIME DESTINATION ${PROJECT_INSTALL_BINDIR} + LIBRARY DESTINATION ${PROJECT_INSTALL_LIBDIR} + RUNTIME DESTINATION ${PROJECT_INSTALL_BINDIR} ) # configure run script with different executable paths for build and for install directories @@ -54,7 +54,7 @@ set(FAIRMQ_BIN_DIR ${CMAKE_INSTALL_PREFIX}/${PROJECT_INSTALL_BINDIR}/fairmq) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fairmq-start-ex-1-1.sh.in ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-1-1.sh_install) install( - PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-1-1.sh_install - DESTINATION ${PROJECT_INSTALL_BINDIR} - RENAME fairmq-start-ex-1-1.sh + PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-1-1.sh_install + DESTINATION ${PROJECT_INSTALL_BINDIR} + RENAME fairmq-start-ex-1-1.sh ) diff --git a/examples/1-n-1/CMakeLists.txt b/examples/1-n-1/CMakeLists.txt index 032f5a1a..4ba7df72 100644 --- a/examples/1-n-1/CMakeLists.txt +++ b/examples/1-n-1/CMakeLists.txt @@ -7,12 +7,12 @@ ################################################################################ add_library(Example1N1Lib STATIC - "Sampler.cxx" - "Sampler.h" - "Processor.cxx" - "Processor.h" - "Sink.cxx" - "Sink.h" + "Sampler.cxx" + "Sampler.h" + "Processor.cxx" + "Processor.h" + "Sink.cxx" + "Sink.h" ) target_link_libraries(Example1N1Lib PUBLIC FairMQ) @@ -48,13 +48,13 @@ set_tests_properties(Example.1-n-1.shmem PROPERTIES TIMEOUT "30" RUN_SERIAL true # install install( - TARGETS - fairmq-ex-1-n-1-sampler - fairmq-ex-1-n-1-processor - fairmq-ex-1-n-1-sink + TARGETS + fairmq-ex-1-n-1-sampler + fairmq-ex-1-n-1-processor + fairmq-ex-1-n-1-sink - LIBRARY DESTINATION ${PROJECT_INSTALL_LIBDIR} - RUNTIME DESTINATION ${PROJECT_INSTALL_BINDIR} + LIBRARY DESTINATION ${PROJECT_INSTALL_LIBDIR} + RUNTIME DESTINATION ${PROJECT_INSTALL_BINDIR} ) # configure run script with different executable paths for build and for install directories @@ -64,12 +64,12 @@ set(FAIRMQ_BIN_DIR ${CMAKE_INSTALL_PREFIX}/${PROJECT_INSTALL_BINDIR}/fairmq) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fairmq-start-ex-1-n-1.sh.in ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-1-n-1.sh_install) install( - PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-1-n-1.sh_install - DESTINATION ${PROJECT_INSTALL_BINDIR} - RENAME fairmq-start-ex-1-n-1.sh + PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-1-n-1.sh_install + DESTINATION ${PROJECT_INSTALL_BINDIR} + RENAME fairmq-start-ex-1-n-1.sh ) install( - FILES ${CMAKE_CURRENT_BINARY_DIR}/ex-1-n-1.json - DESTINATION ${PROJECT_INSTALL_DATADIR} + FILES ${CMAKE_CURRENT_BINARY_DIR}/ex-1-n-1.json + DESTINATION ${PROJECT_INSTALL_DATADIR} ) diff --git a/examples/builtin-devices/CMakeLists.txt b/examples/builtin-devices/CMakeLists.txt index 679c7a8d..45521a82 100644 --- a/examples/builtin-devices/CMakeLists.txt +++ b/examples/builtin-devices/CMakeLists.txt @@ -34,7 +34,7 @@ set(FAIRMQ_BIN_DIR ${CMAKE_INSTALL_PREFIX}/${PROJECT_INSTALL_BINDIR}/fairmq) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fairmq-start-ex-builtin-devices.sh.in ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-builtin-devices.sh_install) install( - PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-builtin-devices.sh_install - DESTINATION ${PROJECT_INSTALL_BINDIR} - RENAME fairmq-start-ex-builtin-devices.sh + PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-builtin-devices.sh_install + DESTINATION ${PROJECT_INSTALL_BINDIR} + RENAME fairmq-start-ex-builtin-devices.sh ) diff --git a/examples/copypush/CMakeLists.txt b/examples/copypush/CMakeLists.txt index b27c9619..8b6a353e 100644 --- a/examples/copypush/CMakeLists.txt +++ b/examples/copypush/CMakeLists.txt @@ -7,10 +7,10 @@ ################################################################################ add_library(ExampleCopyPushLib STATIC - "Sampler.cxx" - "Sampler.h" - "Sink.cxx" - "Sink.h" + "Sampler.cxx" + "Sampler.h" + "Sink.cxx" + "Sink.h" ) target_link_libraries(ExampleCopyPushLib PUBLIC FairMQ) @@ -41,12 +41,12 @@ set_tests_properties(Example.CopyPush.shmem PROPERTIES TIMEOUT "30" RUN_SERIAL t # install install( - TARGETS - fairmq-ex-copypush-sampler - fairmq-ex-copypush-sink + TARGETS + fairmq-ex-copypush-sampler + fairmq-ex-copypush-sink - LIBRARY DESTINATION ${PROJECT_INSTALL_LIBDIR} - RUNTIME DESTINATION ${PROJECT_INSTALL_BINDIR} + LIBRARY DESTINATION ${PROJECT_INSTALL_LIBDIR} + RUNTIME DESTINATION ${PROJECT_INSTALL_BINDIR} ) # configure run script with different executable paths for build and for install directories @@ -55,7 +55,7 @@ set(FAIRMQ_BIN_DIR ${CMAKE_INSTALL_PREFIX}/${PROJECT_INSTALL_BINDIR}/fairmq) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fairmq-start-ex-copypush.sh.in ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-copypush.sh_install) install( - PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-copypush.sh_install - DESTINATION ${PROJECT_INSTALL_BINDIR} - RENAME fairmq-start-ex-copypush.sh + PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-copypush.sh_install + DESTINATION ${PROJECT_INSTALL_BINDIR} + RENAME fairmq-start-ex-copypush.sh ) diff --git a/examples/multipart/CMakeLists.txt b/examples/multipart/CMakeLists.txt index 500c7edd..bb3ef930 100644 --- a/examples/multipart/CMakeLists.txt +++ b/examples/multipart/CMakeLists.txt @@ -7,10 +7,10 @@ ################################################################################ add_library(ExampleMultipartLib STATIC - "Sampler.cxx" - "Sampler.h" - "Sink.cxx" - "Sink.h" + "Sampler.cxx" + "Sampler.h" + "Sink.cxx" + "Sink.h" ) target_link_libraries(ExampleMultipartLib PUBLIC FairMQ) @@ -45,12 +45,12 @@ endif() # install install( - TARGETS - fairmq-ex-multipart-sampler - fairmq-ex-multipart-sink + TARGETS + fairmq-ex-multipart-sampler + fairmq-ex-multipart-sink - LIBRARY DESTINATION ${PROJECT_INSTALL_LIBDIR} - RUNTIME DESTINATION ${PROJECT_INSTALL_BINDIR} + LIBRARY DESTINATION ${PROJECT_INSTALL_LIBDIR} + RUNTIME DESTINATION ${PROJECT_INSTALL_BINDIR} ) # configure run script with different executable paths for build and for install directories @@ -59,7 +59,7 @@ set(FAIRMQ_BIN_DIR ${CMAKE_INSTALL_PREFIX}/${PROJECT_INSTALL_BINDIR}/fairmq) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fairmq-start-ex-multipart.sh.in ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-multipart.sh_install) install( - PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-multipart.sh_install - DESTINATION ${PROJECT_INSTALL_BINDIR} - RENAME fairmq-start-ex-multipart.sh + PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-multipart.sh_install + DESTINATION ${PROJECT_INSTALL_BINDIR} + RENAME fairmq-start-ex-multipart.sh ) diff --git a/examples/multiple-channels/CMakeLists.txt b/examples/multiple-channels/CMakeLists.txt index 9a0a02d4..39b85e14 100644 --- a/examples/multiple-channels/CMakeLists.txt +++ b/examples/multiple-channels/CMakeLists.txt @@ -7,12 +7,12 @@ ################################################################################ add_library(ExampleMultipleChannelsLib STATIC - "Sampler.cxx" - "Sampler.h" - "Broadcaster.cxx" - "Broadcaster.h" - "Sink.cxx" - "Sink.h" + "Sampler.cxx" + "Sampler.h" + "Broadcaster.cxx" + "Broadcaster.h" + "Sink.cxx" + "Sink.h" ) target_link_libraries(ExampleMultipleChannelsLib PUBLIC FairMQ) @@ -42,13 +42,13 @@ set_tests_properties(Example.MultipleChannels.zeromq PROPERTIES TIMEOUT "30" RUN # install install( - TARGETS - fairmq-ex-multiple-channels-sampler - fairmq-ex-multiple-channels-broadcaster - fairmq-ex-multiple-channels-sink + TARGETS + fairmq-ex-multiple-channels-sampler + fairmq-ex-multiple-channels-broadcaster + fairmq-ex-multiple-channels-sink - LIBRARY DESTINATION ${PROJECT_INSTALL_LIBDIR} - RUNTIME DESTINATION ${PROJECT_INSTALL_BINDIR} + LIBRARY DESTINATION ${PROJECT_INSTALL_LIBDIR} + RUNTIME DESTINATION ${PROJECT_INSTALL_BINDIR} ) # configure run script with different executable paths for build and for install directories @@ -57,7 +57,7 @@ set(FAIRMQ_BIN_DIR ${CMAKE_INSTALL_PREFIX}/${PROJECT_INSTALL_BINDIR}/fairmq) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fairmq-start-ex-multiple-channels.sh.in ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-multiple-channels.sh_install) install( - PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-multiple-channels.sh_install - DESTINATION ${PROJECT_INSTALL_BINDIR} - RENAME fairmq-start-ex-multiple-channels.sh + PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-multiple-channels.sh_install + DESTINATION ${PROJECT_INSTALL_BINDIR} + RENAME fairmq-start-ex-multiple-channels.sh ) diff --git a/examples/multiple-transports/CMakeLists.txt b/examples/multiple-transports/CMakeLists.txt index 24a0a774..08dd987b 100644 --- a/examples/multiple-transports/CMakeLists.txt +++ b/examples/multiple-transports/CMakeLists.txt @@ -7,12 +7,12 @@ ################################################################################ add_library(ExampleMultipleTransportsLib STATIC - "Sampler1.cxx" - "Sampler1.h" - "Sampler2.cxx" - "Sampler2.h" - "Sink.cxx" - "Sink.h" + "Sampler1.cxx" + "Sampler1.h" + "Sampler2.cxx" + "Sampler2.h" + "Sink.cxx" + "Sink.h" ) target_link_libraries(ExampleMultipleTransportsLib PUBLIC FairMQ) @@ -41,13 +41,13 @@ set_tests_properties(Example.MultipleTransports PROPERTIES TIMEOUT "30" RUN_SERI # install install( - TARGETS - fairmq-ex-multiple-transports-sampler1 - fairmq-ex-multiple-transports-sampler2 - fairmq-ex-multiple-transports-sink + TARGETS + fairmq-ex-multiple-transports-sampler1 + fairmq-ex-multiple-transports-sampler2 + fairmq-ex-multiple-transports-sink - LIBRARY DESTINATION ${PROJECT_INSTALL_LIBDIR} - RUNTIME DESTINATION ${PROJECT_INSTALL_BINDIR} + LIBRARY DESTINATION ${PROJECT_INSTALL_LIBDIR} + RUNTIME DESTINATION ${PROJECT_INSTALL_BINDIR} ) # configure run script with different executable paths for install directories @@ -56,7 +56,7 @@ set(FAIRMQ_BIN_DIR ${CMAKE_INSTALL_PREFIX}/${PROJECT_INSTALL_BINDIR}/fairmq) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fairmq-start-ex-multiple-transports.sh.in ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-multiple-transports.sh_install) install( - PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-multiple-transports.sh_install - DESTINATION ${PROJECT_INSTALL_BINDIR} - RENAME fairmq-start-ex-multiple-transports.sh + PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-multiple-transports.sh_install + DESTINATION ${PROJECT_INSTALL_BINDIR} + RENAME fairmq-start-ex-multiple-transports.sh ) diff --git a/examples/readout/CMakeLists.txt b/examples/readout/CMakeLists.txt index c8141d27..3ff9d559 100644 --- a/examples/readout/CMakeLists.txt +++ b/examples/readout/CMakeLists.txt @@ -29,15 +29,15 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fairmq-start-ex-readout-processing.sh # install install( - TARGETS - fairmq-ex-readout-readout - fairmq-ex-readout-builder - fairmq-ex-readout-processor - fairmq-ex-readout-sender - fairmq-ex-readout-receiver + TARGETS + fairmq-ex-readout-readout + fairmq-ex-readout-builder + fairmq-ex-readout-processor + fairmq-ex-readout-sender + fairmq-ex-readout-receiver - LIBRARY DESTINATION ${PROJECT_INSTALL_LIBDIR} - RUNTIME DESTINATION ${PROJECT_INSTALL_BINDIR} + LIBRARY DESTINATION ${PROJECT_INSTALL_LIBDIR} + RUNTIME DESTINATION ${PROJECT_INSTALL_BINDIR} ) # configure run script with different executable paths for build and for install directories @@ -47,13 +47,13 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fairmq-start-ex-readout.sh.in ${CMAKE configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fairmq-start-ex-readout-processing.sh.in ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-readout-processing.sh_install) install( - PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-readout.sh_install - DESTINATION ${PROJECT_INSTALL_BINDIR} - RENAME fairmq-start-ex-readout.sh + PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-readout.sh_install + DESTINATION ${PROJECT_INSTALL_BINDIR} + RENAME fairmq-start-ex-readout.sh ) install( - PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-readout-processing.sh_install - DESTINATION ${PROJECT_INSTALL_BINDIR} - RENAME fairmq-start-ex-readout-processing.sh + PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-readout-processing.sh_install + DESTINATION ${PROJECT_INSTALL_BINDIR} + RENAME fairmq-start-ex-readout-processing.sh ) diff --git a/examples/region/CMakeLists.txt b/examples/region/CMakeLists.txt index 7903aea3..76d432e3 100644 --- a/examples/region/CMakeLists.txt +++ b/examples/region/CMakeLists.txt @@ -7,10 +7,10 @@ ################################################################################ add_library(ExampleRegionLib STATIC - "Sampler.cxx" - "Sampler.h" - "Sink.cxx" - "Sink.h" + "Sampler.cxx" + "Sampler.h" + "Sink.cxx" + "Sink.h" ) target_link_libraries(ExampleRegionLib PUBLIC FairMQ) @@ -40,12 +40,12 @@ set_tests_properties(Example.Region.shmem PROPERTIES TIMEOUT "30" RUN_SERIAL tru # install install( - TARGETS - fairmq-ex-region-sampler - fairmq-ex-region-sink + TARGETS + fairmq-ex-region-sampler + fairmq-ex-region-sink - LIBRARY DESTINATION ${PROJECT_INSTALL_LIBDIR} - RUNTIME DESTINATION ${PROJECT_INSTALL_BINDIR} + LIBRARY DESTINATION ${PROJECT_INSTALL_LIBDIR} + RUNTIME DESTINATION ${PROJECT_INSTALL_BINDIR} ) # configure run script with different executable paths for build and for install directories @@ -54,7 +54,7 @@ set(FAIRMQ_BIN_DIR ${CMAKE_INSTALL_PREFIX}/${PROJECT_INSTALL_BINDIR}/fairmq) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fairmq-start-ex-region.sh.in ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-region.sh_install) install( - PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-region.sh_install - DESTINATION ${PROJECT_INSTALL_BINDIR} - RENAME fairmq-start-ex-region.sh + PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-region.sh_install + DESTINATION ${PROJECT_INSTALL_BINDIR} + RENAME fairmq-start-ex-region.sh ) diff --git a/examples/req-rep/CMakeLists.txt b/examples/req-rep/CMakeLists.txt index df7080d8..464c1fd3 100644 --- a/examples/req-rep/CMakeLists.txt +++ b/examples/req-rep/CMakeLists.txt @@ -7,10 +7,10 @@ ################################################################################ add_library(ExampleReqRepLib STATIC - "Client.cxx" - "Client.h" - "Server.cxx" - "Server.h" + "Client.cxx" + "Client.h" + "Server.cxx" + "Server.h" ) target_link_libraries(ExampleReqRepLib PUBLIC FairMQ) @@ -41,12 +41,12 @@ set_tests_properties(Example.ReqRep.shmem PROPERTIES TIMEOUT "30" RUN_SERIAL tru # install install( - TARGETS - fairmq-ex-req-rep-client - fairmq-ex-req-rep-server + TARGETS + fairmq-ex-req-rep-client + fairmq-ex-req-rep-server - LIBRARY DESTINATION ${PROJECT_INSTALL_LIBDIR} - RUNTIME DESTINATION ${PROJECT_INSTALL_BINDIR} + LIBRARY DESTINATION ${PROJECT_INSTALL_LIBDIR} + RUNTIME DESTINATION ${PROJECT_INSTALL_BINDIR} ) # configure run script with different executable paths for build and for install directories @@ -55,7 +55,7 @@ set(FAIRMQ_BIN_DIR ${CMAKE_INSTALL_PREFIX}/${PROJECT_INSTALL_BINDIR}/fairmq) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fairmq-start-ex-req-rep.sh.in ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-req-rep.sh_install) install( - PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-req-rep.sh_install - DESTINATION ${PROJECT_INSTALL_BINDIR} - RENAME fairmq-start-ex-req-rep.sh + PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-req-rep.sh_install + DESTINATION ${PROJECT_INSTALL_BINDIR} + RENAME fairmq-start-ex-req-rep.sh ) diff --git a/fairmq/FairMQDevice.cxx b/fairmq/FairMQDevice.cxx index c4c64f6e..9c158702 100644 --- a/fairmq/FairMQDevice.cxx +++ b/fairmq/FairMQDevice.cxx @@ -486,7 +486,6 @@ void FairMQDevice::RunWrapper() } PostRun(); - } catch (const out_of_range& oor) { LOG(error) << "out of range: " << oor.what(); LOG(error) << "incorrect/incomplete channel configuration?"; @@ -504,17 +503,12 @@ void FairMQDevice::HandleSingleChannelInput() { bool proceed = true; - if (fMsgInputs.size() > 0) - { - while (!NewStatePending() && proceed) - { + if (fMsgInputs.size() > 0) { + while (!NewStatePending() && proceed) { proceed = HandleMsgInput(fInputChannelKeys.at(0), fMsgInputs.begin()->second, 0); } - } - else if (fMultipartInputs.size() > 0) - { - while (!NewStatePending() && proceed) - { + } else if (fMultipartInputs.size() > 0) { + while (!NewStatePending() && proceed) { proceed = HandleMultipartInput(fInputChannelKeys.at(0), fMultipartInputs.begin()->second, 0); } } @@ -524,75 +518,55 @@ void FairMQDevice::HandleMultipleChannelInput() { // check if more than one transport is used fMultitransportInputs.clear(); - for (const auto& k : fInputChannelKeys) - { + for (const auto& k : fInputChannelKeys) { fair::mq::Transport t = fChannels.at(k).at(0).fTransportType; - if (fMultitransportInputs.find(t) == fMultitransportInputs.end()) - { + if (fMultitransportInputs.find(t) == fMultitransportInputs.end()) { fMultitransportInputs.insert(pair>(t, vector())); fMultitransportInputs.at(t).push_back(k); - } - else - { + } else { fMultitransportInputs.at(t).push_back(k); } } - for (const auto& mi : fMsgInputs) - { - for (auto& i : fChannels.at(mi.first)) - { + for (const auto& mi : fMsgInputs) { + for (auto& i : fChannels.at(mi.first)) { i.fMultipart = false; } } - for (const auto& mi : fMultipartInputs) - { - for (auto& i : fChannels.at(mi.first)) - { + for (const auto& mi : fMultipartInputs) { + for (auto& i : fChannels.at(mi.first)) { i.fMultipart = true; } } // if more than one transport is used, handle poll of each in a separate thread - if (fMultitransportInputs.size() > 1) - { + if (fMultitransportInputs.size() > 1) { HandleMultipleTransportInput(); - } - else // otherwise poll directly - { + } else { // otherwise poll directly bool proceed = true; FairMQPollerPtr poller(fChannels.at(fInputChannelKeys.at(0)).at(0).fTransportFactory->CreatePoller(fChannels, fInputChannelKeys)); - while (!NewStatePending() && proceed) - { + while (!NewStatePending() && proceed) { poller->Poll(200); // check which inputs are ready and call their data handlers if they are. - for (const auto& ch : fInputChannelKeys) - { - for (unsigned int i = 0; i < fChannels.at(ch).size(); ++i) - { - if (poller->CheckInput(ch, i)) - { - if (fChannels.at(ch).at(i).fMultipart) - { + for (const auto& ch : fInputChannelKeys) { + for (unsigned int i = 0; i < fChannels.at(ch).size(); ++i) { + if (poller->CheckInput(ch, i)) { + if (fChannels.at(ch).at(i).fMultipart) { proceed = HandleMultipartInput(ch, fMultipartInputs.at(ch), i); - } - else - { + } else { proceed = HandleMsgInput(ch, fMsgInputs.at(ch), i); } - if (!proceed) - { + if (!proceed) { break; } } } - if (!proceed) - { + if (!proceed) { break; } } @@ -606,64 +580,49 @@ void FairMQDevice::HandleMultipleTransportInput() fMultitransportProceed = true; - for (const auto& i : fMultitransportInputs) - { + for (const auto& i : fMultitransportInputs) { threads.emplace_back(thread(&FairMQDevice::PollForTransport, this, fTransports.at(i.first).get(), i.second)); } - for (thread& t : threads) - { + for (thread& t : threads) { t.join(); } } void FairMQDevice::PollForTransport(const FairMQTransportFactory* factory, const vector& channelKeys) { - try - { + try { FairMQPollerPtr poller(factory->CreatePoller(fChannels, channelKeys)); - while (!NewStatePending() && fMultitransportProceed) - { + while (!NewStatePending() && fMultitransportProceed) { poller->Poll(500); - for (const auto& ch : channelKeys) - { - for (unsigned int i = 0; i < fChannels.at(ch).size(); ++i) - { - if (poller->CheckInput(ch, i)) - { + for (const auto& ch : channelKeys) { + for (unsigned int i = 0; i < fChannels.at(ch).size(); ++i) { + if (poller->CheckInput(ch, i)) { lock_guard lock(fMultitransportMutex); - if (!fMultitransportProceed) - { + if (!fMultitransportProceed) { break; } - if (fChannels.at(ch).at(i).fMultipart) - { + if (fChannels.at(ch).at(i).fMultipart) { fMultitransportProceed = HandleMultipartInput(ch, fMultipartInputs.at(ch), i); - } - else - { + } else { fMultitransportProceed = HandleMsgInput(ch, fMsgInputs.at(ch), i); } - if (!fMultitransportProceed) - { + if (!fMultitransportProceed) { break; } } } - if (!fMultitransportProceed) - { + if (!fMultitransportProceed) { break; } } } - } - catch (exception& e) - { + } catch (exception& e) { LOG(error) << "FairMQDevice::PollForTransport() failed: " << e.what() << ", going to ERROR state."; throw runtime_error(tools::ToString("FairMQDevice::PollForTransport() failed: ", e.what(), ", going to ERROR state.")); } @@ -673,12 +632,9 @@ bool FairMQDevice::HandleMsgInput(const string& chName, const InputMsgCallback& { unique_ptr input(fChannels.at(chName).at(i).fTransportFactory->CreateMessage()); - if (Receive(input, chName, i) >= 0) - { + if (Receive(input, chName, i) >= 0) { return callback(input, i); - } - else - { + } else { return false; } } @@ -687,12 +643,9 @@ bool FairMQDevice::HandleMultipartInput(const string& chName, const InputMultipa { FairMQParts input; - if (Receive(input, chName, i) >= 0) - { + if (Receive(input, chName, i) >= 0) { return callback(input, 0); - } - else - { + } else { return false; } } diff --git a/fairmq/shmem/Region.h b/fairmq/shmem/Region.h index 6be11135..8773245e 100644 --- a/fairmq/shmem/Region.h +++ b/fairmq/shmem/Region.h @@ -152,7 +152,7 @@ struct Region } } - LOG(debug) << "AcksSender for " << fName << " leaving " << "(blocks left to free: " << fBlocksToFree.size() << ", " + LOG(trace) << "AcksSender for " << fName << " leaving " << "(blocks left to free: " << fBlocksToFree.size() << ", " << " blocks left to send: " << blocksToSend << ")."; } @@ -195,7 +195,7 @@ struct Region } } - LOG(debug) << "AcksReceiver for " << fName << " leaving (remaining queue size: " << fQueue->get_num_msg() << ")."; + LOG(trace) << "AcksReceiver for " << fName << " leaving (remaining queue size: " << fQueue->get_num_msg() << ")."; } void ReleaseBlock(const RegionBlock& block)