From daf6856ce55de380f631f1f819cfaf2a7ed71137 Mon Sep 17 00:00:00 2001 From: Alexey Rybalchenko Date: Wed, 13 Jan 2016 17:21:24 +0100 Subject: [PATCH] Remove compile time transport interface switch - Remove the compile time check of the transport implementation. The transport (zeromq/nanomsg) can be chosen at run time with: `device.SetTransport("zeromq"); // possible values are "zeromq" and "nanomsg"`. For devices that use FairMQProgOptions, the transport can be configured via cmd option: `--transport zeromq` or `--transport nanomsg`. Default values is "zeromq". The device receives the configured value with: `device.SetTransport(config.GetValue("transport"));` Old method of setting transport still works. But the NANOMSG constant is not defined. - Remove old `fairmq/prototest` directory. It was only used as a test for protobuf. The protobuf part of Tutorial3 does the same (with different values). - Fix a bug in FairMQPollerNN, where the `revents` value was not initialized. This caused the `poller->CheckOutput()` to trigger when it should not. --- examples/MQ/1-sampler-sink/CMakeLists.txt | 24 +++--------------- .../MQ/1-sampler-sink/runExample1Sampler.cxx | 14 +---------- .../MQ/1-sampler-sink/runExample1Sink.cxx | 14 +---------- .../2-sampler-processor-sink/CMakeLists.txt | 24 +++--------------- .../runExample2Processor.cxx | 14 +---------- .../runExample2Sampler.cxx | 14 +---------- .../runExample2Sink.cxx | 14 +---------- examples/MQ/3-dds/CMakeLists.txt | 25 ++++--------------- examples/MQ/3-dds/runExample3Processor.cxx | 14 +---------- examples/MQ/3-dds/runExample3Sampler.cxx | 14 +---------- examples/MQ/3-dds/runExample3Sink.cxx | 14 +---------- examples/MQ/4-copypush/CMakeLists.txt | 25 +++---------------- examples/MQ/4-copypush/runExample4Sampler.cxx | 14 +---------- examples/MQ/4-copypush/runExample4Sink.cxx | 14 +---------- examples/MQ/5-req-rep/CMakeLists.txt | 24 +++--------------- examples/MQ/5-req-rep/runExample5Client.cxx | 14 +---------- examples/MQ/5-req-rep/runExample5Server.cxx | 14 +---------- .../MQ/6-multiple-channels/CMakeLists.txt | 24 +++--------------- .../runExample6Broadcaster.cxx | 14 +---------- .../runExample6Sampler.cxx | 14 +---------- .../6-multiple-channels/runExample6Sink.cxx | 14 +---------- examples/MQ/8-multipart/CMakeLists.txt | 24 +++--------------- .../MQ/8-multipart/runExample8Sampler.cxx | 14 +---------- examples/MQ/8-multipart/runExample8Sink.cxx | 14 +---------- 24 files changed, 46 insertions(+), 362 deletions(-) diff --git a/examples/MQ/1-sampler-sink/CMakeLists.txt b/examples/MQ/1-sampler-sink/CMakeLists.txt index 81a37fbe..02ff38f2 100644 --- a/examples/MQ/1-sampler-sink/CMakeLists.txt +++ b/examples/MQ/1-sampler-sink/CMakeLists.txt @@ -10,6 +10,8 @@ configure_file(${CMAKE_SOURCE_DIR}/examples/MQ/1-sampler-sink/ex1-sampler-sink.j Set(INCLUDE_DIRECTORIES ${CMAKE_SOURCE_DIR}/fairmq + ${CMAKE_SOURCE_DIR}/fairmq/zeromq + ${CMAKE_SOURCE_DIR}/fairmq/nanomsg ${CMAKE_SOURCE_DIR}/fairmq/devices ${CMAKE_SOURCE_DIR}/fairmq/tools ${CMAKE_SOURCE_DIR}/fairmq/options @@ -19,28 +21,10 @@ Set(INCLUDE_DIRECTORIES Set(SYSTEM_INCLUDE_DIRECTORIES ${Boost_INCLUDE_DIR} + ${ZMQ_INCLUDE_DIR} + ${NANOMSG_INCLUDE_DIR} ) -If(NANOMSG_FOUND) - Set(INCLUDE_DIRECTORIES - ${INCLUDE_DIRECTORIES} - ${CMAKE_SOURCE_DIR}/fairmq/nanomsg - ) - Set(SYSTEM_INCLUDE_DIRECTORIES - ${SYSTEM_INCLUDE_DIRECTORIES} - ${NANOMSG_INCLUDE_DIR} - ) -Else(NANOMSG_FOUND) - Set(INCLUDE_DIRECTORIES - ${INCLUDE_DIRECTORIES} - ${CMAKE_SOURCE_DIR}/fairmq/zeromq - ) - Set(SYSTEM_INCLUDE_DIRECTORIES - ${SYSTEM_INCLUDE_DIRECTORIES} - ${ZMQ_INCLUDE_DIR} - ) -EndIf(NANOMSG_FOUND) - Include_Directories(${INCLUDE_DIRECTORIES}) Include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES}) diff --git a/examples/MQ/1-sampler-sink/runExample1Sampler.cxx b/examples/MQ/1-sampler-sink/runExample1Sampler.cxx index 8784142b..7b83a9c6 100644 --- a/examples/MQ/1-sampler-sink/runExample1Sampler.cxx +++ b/examples/MQ/1-sampler-sink/runExample1Sampler.cxx @@ -21,12 +21,6 @@ #include "FairMQProgOptions.h" #include "FairMQExample1Sampler.h" -#ifdef NANOMSG -#include "FairMQTransportFactoryNN.h" -#else -#include "FairMQTransportFactoryZMQ.h" -#endif - using namespace boost::program_options; int main(int argc, char** argv) @@ -60,13 +54,7 @@ int main(int argc, char** argv) LOG(INFO) << "PID: " << getpid(); -#ifdef NANOMSG - FairMQTransportFactory* transportFactory = new FairMQTransportFactoryNN(); -#else - FairMQTransportFactory* transportFactory = new FairMQTransportFactoryZMQ(); -#endif - - sampler.SetTransport(transportFactory); + sampler.SetTransport(config.GetValue("transport")); sampler.SetProperty(FairMQExample1Sampler::Id, id); sampler.SetProperty(FairMQExample1Sampler::Text, text); diff --git a/examples/MQ/1-sampler-sink/runExample1Sink.cxx b/examples/MQ/1-sampler-sink/runExample1Sink.cxx index 4080cf4b..02e7e6f6 100644 --- a/examples/MQ/1-sampler-sink/runExample1Sink.cxx +++ b/examples/MQ/1-sampler-sink/runExample1Sink.cxx @@ -19,12 +19,6 @@ #include "FairMQProgOptions.h" #include "FairMQExample1Sink.h" -#ifdef NANOMSG -#include "FairMQTransportFactoryNN.h" -#else -#include "FairMQTransportFactoryZMQ.h" -#endif - int main(int argc, char** argv) { FairMQExample1Sink sink; @@ -48,13 +42,7 @@ int main(int argc, char** argv) LOG(INFO) << "PID: " << getpid(); -#ifdef NANOMSG - FairMQTransportFactory* transportFactory = new FairMQTransportFactoryNN(); -#else - FairMQTransportFactory* transportFactory = new FairMQTransportFactoryZMQ(); -#endif - - sink.SetTransport(transportFactory); + sink.SetTransport(config.GetValue("transport")); sink.SetProperty(FairMQExample1Sink::Id, id); diff --git a/examples/MQ/2-sampler-processor-sink/CMakeLists.txt b/examples/MQ/2-sampler-processor-sink/CMakeLists.txt index fef5ffba..44f99da1 100644 --- a/examples/MQ/2-sampler-processor-sink/CMakeLists.txt +++ b/examples/MQ/2-sampler-processor-sink/CMakeLists.txt @@ -10,6 +10,8 @@ configure_file(${CMAKE_SOURCE_DIR}/examples/MQ/2-sampler-processor-sink/ex2-samp Set(INCLUDE_DIRECTORIES ${CMAKE_SOURCE_DIR}/fairmq + ${CMAKE_SOURCE_DIR}/fairmq/zeromq + ${CMAKE_SOURCE_DIR}/fairmq/nanomsg ${CMAKE_SOURCE_DIR}/fairmq/devices ${CMAKE_SOURCE_DIR}/fairmq/tools ${CMAKE_SOURCE_DIR}/fairmq/options @@ -19,28 +21,10 @@ Set(INCLUDE_DIRECTORIES Set(SYSTEM_INCLUDE_DIRECTORIES ${Boost_INCLUDE_DIR} + ${ZMQ_INCLUDE_DIR} + ${NANOMSG_INCLUDE_DIR} ) -If(NANOMSG_FOUND) - Set(INCLUDE_DIRECTORIES - ${INCLUDE_DIRECTORIES} - ${CMAKE_SOURCE_DIR}/fairmq/nanomsg - ) - Set(SYSTEM_INCLUDE_DIRECTORIES - ${SYSTEM_INCLUDE_DIRECTORIES} - ${ZMQ_INCLUDE_DIR} - ) -Else(NANOMSG_FOUND) - Set(INCLUDE_DIRECTORIES - ${INCLUDE_DIRECTORIES} - ${CMAKE_SOURCE_DIR}/fairmq/zeromq - ) - Set(SYSTEM_INCLUDE_DIRECTORIES - ${SYSTEM_INCLUDE_DIRECTORIES} - ${ZMQ_INCLUDE_DIR} - ) -EndIf(NANOMSG_FOUND) - Include_Directories(${INCLUDE_DIRECTORIES}) Include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES}) diff --git a/examples/MQ/2-sampler-processor-sink/runExample2Processor.cxx b/examples/MQ/2-sampler-processor-sink/runExample2Processor.cxx index 3e72f0de..3afd08e5 100644 --- a/examples/MQ/2-sampler-processor-sink/runExample2Processor.cxx +++ b/examples/MQ/2-sampler-processor-sink/runExample2Processor.cxx @@ -19,12 +19,6 @@ #include "FairMQProgOptions.h" #include "FairMQExample2Processor.h" -#ifdef NANOMSG -#include "FairMQTransportFactoryNN.h" -#else -#include "FairMQTransportFactoryZMQ.h" -#endif - int main(int argc, char** argv) { FairMQExample2Processor processor; @@ -48,13 +42,7 @@ int main(int argc, char** argv) LOG(INFO) << "PID: " << getpid(); -#ifdef NANOMSG - FairMQTransportFactory* transportFactory = new FairMQTransportFactoryNN(); -#else - FairMQTransportFactory* transportFactory = new FairMQTransportFactoryZMQ(); -#endif - - processor.SetTransport(transportFactory); + processor.SetTransport(config.GetValue("transport")); processor.SetProperty(FairMQExample2Processor::Id, id); diff --git a/examples/MQ/2-sampler-processor-sink/runExample2Sampler.cxx b/examples/MQ/2-sampler-processor-sink/runExample2Sampler.cxx index b76f3a42..b699bab3 100644 --- a/examples/MQ/2-sampler-processor-sink/runExample2Sampler.cxx +++ b/examples/MQ/2-sampler-processor-sink/runExample2Sampler.cxx @@ -21,12 +21,6 @@ #include "FairMQProgOptions.h" #include "FairMQExample2Sampler.h" -#ifdef NANOMSG -#include "FairMQTransportFactoryNN.h" -#else -#include "FairMQTransportFactoryZMQ.h" -#endif - using namespace boost::program_options; int main(int argc, char** argv) @@ -60,13 +54,7 @@ int main(int argc, char** argv) LOG(INFO) << "PID: " << getpid(); -#ifdef NANOMSG - FairMQTransportFactory* transportFactory = new FairMQTransportFactoryNN(); -#else - FairMQTransportFactory* transportFactory = new FairMQTransportFactoryZMQ(); -#endif - - sampler.SetTransport(transportFactory); + sampler.SetTransport(config.GetValue("transport")); sampler.SetProperty(FairMQExample2Sampler::Id, id); sampler.SetProperty(FairMQExample2Sampler::Text, text); diff --git a/examples/MQ/2-sampler-processor-sink/runExample2Sink.cxx b/examples/MQ/2-sampler-processor-sink/runExample2Sink.cxx index 1f71b156..16b9566f 100644 --- a/examples/MQ/2-sampler-processor-sink/runExample2Sink.cxx +++ b/examples/MQ/2-sampler-processor-sink/runExample2Sink.cxx @@ -19,12 +19,6 @@ #include "FairMQProgOptions.h" #include "FairMQExample2Sink.h" -#ifdef NANOMSG -#include "FairMQTransportFactoryNN.h" -#else -#include "FairMQTransportFactoryZMQ.h" -#endif - int main(int argc, char** argv) { FairMQExample2Sink sink; @@ -48,13 +42,7 @@ int main(int argc, char** argv) LOG(INFO) << "PID: " << getpid(); -#ifdef NANOMSG - FairMQTransportFactory* transportFactory = new FairMQTransportFactoryNN(); -#else - FairMQTransportFactory* transportFactory = new FairMQTransportFactoryZMQ(); -#endif - - sink.SetTransport(transportFactory); + sink.SetTransport(config.GetValue("transport")); sink.SetProperty(FairMQExample2Sink::Id, id); diff --git a/examples/MQ/3-dds/CMakeLists.txt b/examples/MQ/3-dds/CMakeLists.txt index 75d5bebc..f066232b 100644 --- a/examples/MQ/3-dds/CMakeLists.txt +++ b/examples/MQ/3-dds/CMakeLists.txt @@ -13,6 +13,8 @@ add_definitions(-DENABLE_DDS) Set(INCLUDE_DIRECTORIES ${CMAKE_SOURCE_DIR}/fairmq + ${CMAKE_SOURCE_DIR}/fairmq/zeromq + ${CMAKE_SOURCE_DIR}/fairmq/nanomsg ${CMAKE_SOURCE_DIR}/fairmq/devices ${CMAKE_SOURCE_DIR}/fairmq/tools ${CMAKE_SOURCE_DIR}/fairmq/options @@ -22,29 +24,12 @@ Set(INCLUDE_DIRECTORIES Set(SYSTEM_INCLUDE_DIRECTORIES ${SYSTEM_INCLUDE_DIRECTORIES} + ${Boost_INCLUDE_DIR} ${DDS_INCLUDE_DIR} + ${ZMQ_INCLUDE_DIR} + ${NANOMSG_INCLUDE_DIR} ) -If(NANOMSG_FOUND) - Set(INCLUDE_DIRECTORIES - ${INCLUDE_DIRECTORIES} - ${CMAKE_SOURCE_DIR}/fairmq/nanomsg - ) - Set(SYSTEM_INCLUDE_DIRECTORIES - ${SYSTEM_INCLUDE_DIRECTORIES} - ${NANOMSG_INCLUDE_DIR} - ) -Else(NANOMSG_FOUND) - Set(INCLUDE_DIRECTORIES - ${INCLUDE_DIRECTORIES} - ${CMAKE_SOURCE_DIR}/fairmq/zeromq - ) - Set(SYSTEM_INCLUDE_DIRECTORIES - ${SYSTEM_INCLUDE_DIRECTORIES} - ${ZMQ_INCLUDE_DIR} - ) -EndIf(NANOMSG_FOUND) - Include_Directories(${INCLUDE_DIRECTORIES}) Include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES}) diff --git a/examples/MQ/3-dds/runExample3Processor.cxx b/examples/MQ/3-dds/runExample3Processor.cxx index c1fd272f..16e771b0 100644 --- a/examples/MQ/3-dds/runExample3Processor.cxx +++ b/examples/MQ/3-dds/runExample3Processor.cxx @@ -24,12 +24,6 @@ #include "FairMQExample3Processor.h" #include "FairMQTools.h" -#ifdef NANOMSG -#include "FairMQTransportFactoryNN.h" -#else -#include "FairMQTransportFactoryZMQ.h" -#endif - #include "KeyValue.h" // DDS Key Value #include "CustomCmd.h" // DDS Custom Commands @@ -54,13 +48,7 @@ int main(int argc, char** argv) LOG(INFO) << "PID: " << getpid(); -#ifdef NANOMSG - FairMQTransportFactory* transportFactory = new FairMQTransportFactoryNN(); -#else - FairMQTransportFactory* transportFactory = new FairMQTransportFactoryZMQ(); -#endif - - processor.SetTransport(transportFactory); + processor.SetTransport(config.GetValue("transport")); processor.SetProperty(FairMQExample3Processor::Id, id); diff --git a/examples/MQ/3-dds/runExample3Sampler.cxx b/examples/MQ/3-dds/runExample3Sampler.cxx index a61a4d94..cff16797 100644 --- a/examples/MQ/3-dds/runExample3Sampler.cxx +++ b/examples/MQ/3-dds/runExample3Sampler.cxx @@ -25,12 +25,6 @@ #include "FairMQExample3Sampler.h" #include "FairMQTools.h" -#ifdef NANOMSG -#include "FairMQTransportFactoryNN.h" -#else -#include "FairMQTransportFactoryZMQ.h" -#endif - #include "KeyValue.h" // DDS Key Value #include "CustomCmd.h" // DDS Custom Commands @@ -63,13 +57,7 @@ int main(int argc, char** argv) LOG(INFO) << "PID: " << getpid(); -#ifdef NANOMSG - FairMQTransportFactory* transportFactory = new FairMQTransportFactoryNN(); -#else - FairMQTransportFactory* transportFactory = new FairMQTransportFactoryZMQ(); -#endif - - sampler.SetTransport(transportFactory); + sampler.SetTransport(config.GetValue("transport")); sampler.SetProperty(FairMQExample3Sampler::Id, id); diff --git a/examples/MQ/3-dds/runExample3Sink.cxx b/examples/MQ/3-dds/runExample3Sink.cxx index 752d5973..995a9536 100644 --- a/examples/MQ/3-dds/runExample3Sink.cxx +++ b/examples/MQ/3-dds/runExample3Sink.cxx @@ -25,12 +25,6 @@ #include "FairMQExample3Sink.h" #include "FairMQTools.h" -#ifdef NANOMSG -#include "FairMQTransportFactoryNN.h" -#else -#include "FairMQTransportFactoryZMQ.h" -#endif - #include "KeyValue.h" // DDS Key Value #include "CustomCmd.h" // DDS Custom Commands @@ -63,13 +57,7 @@ int main(int argc, char** argv) LOG(INFO) << "PID: " << getpid(); -#ifdef NANOMSG - FairMQTransportFactory* transportFactory = new FairMQTransportFactoryNN(); -#else - FairMQTransportFactory* transportFactory = new FairMQTransportFactoryZMQ(); -#endif - - sink.SetTransport(transportFactory); + sink.SetTransport(config.GetValue("transport")); sink.SetProperty(FairMQExample3Sink::Id, id); diff --git a/examples/MQ/4-copypush/CMakeLists.txt b/examples/MQ/4-copypush/CMakeLists.txt index d2152e92..688fe16b 100644 --- a/examples/MQ/4-copypush/CMakeLists.txt +++ b/examples/MQ/4-copypush/CMakeLists.txt @@ -10,6 +10,8 @@ configure_file(${CMAKE_SOURCE_DIR}/examples/MQ/4-copypush/ex4-copypush.json ${CM Set(INCLUDE_DIRECTORIES ${CMAKE_SOURCE_DIR}/fairmq + ${CMAKE_SOURCE_DIR}/fairmq/zeromq + ${CMAKE_SOURCE_DIR}/fairmq/nanomsg ${CMAKE_SOURCE_DIR}/fairmq/devices ${CMAKE_SOURCE_DIR}/fairmq/tools ${CMAKE_SOURCE_DIR}/fairmq/options @@ -19,29 +21,10 @@ Set(INCLUDE_DIRECTORIES Set(SYSTEM_INCLUDE_DIRECTORIES ${Boost_INCLUDE_DIR} + ${ZMQ_INCLUDE_DIR} + ${NANOMSG_INCLUDE_DIR} ) -If(NANOMSG_FOUND) - Set(INCLUDE_DIRECTORIES - ${INCLUDE_DIRECTORIES} - ${CMAKE_SOURCE_DIR}/fairmq/nanomsg - ) - Set(SYSTEM_INCLUDE_DIRECTORIES - ${SYSTEM_INCLUDE_DIRECTORIES} - ${ZMQ_INCLUDE_DIR} - ) -Else(NANOMSG_FOUND) - Set(INCLUDE_DIRECTORIES - ${INCLUDE_DIRECTORIES} - ${CMAKE_SOURCE_DIR}/fairmq/zeromq - ) - Set(SYSTEM_INCLUDE_DIRECTORIES - ${SYSTEM_INCLUDE_DIRECTORIES} - ${ZMQ_INCLUDE_DIR} - ) -EndIf(NANOMSG_FOUND) - - Include_Directories(${INCLUDE_DIRECTORIES}) Include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES}) diff --git a/examples/MQ/4-copypush/runExample4Sampler.cxx b/examples/MQ/4-copypush/runExample4Sampler.cxx index ddfd7002..6fa941c6 100644 --- a/examples/MQ/4-copypush/runExample4Sampler.cxx +++ b/examples/MQ/4-copypush/runExample4Sampler.cxx @@ -19,12 +19,6 @@ #include "FairMQProgOptions.h" #include "FairMQExample4Sampler.h" -#ifdef NANOMSG -#include "FairMQTransportFactoryNN.h" -#else -#include "FairMQTransportFactoryZMQ.h" -#endif - int main(int argc, char** argv) { FairMQExample4Sampler sampler; @@ -48,13 +42,7 @@ int main(int argc, char** argv) LOG(INFO) << "PID: " << getpid(); -#ifdef NANOMSG - FairMQTransportFactory* transportFactory = new FairMQTransportFactoryNN(); -#else - FairMQTransportFactory* transportFactory = new FairMQTransportFactoryZMQ(); -#endif - - sampler.SetTransport(transportFactory); + sampler.SetTransport(config.GetValue("transport")); sampler.SetProperty(FairMQExample4Sampler::Id, id); diff --git a/examples/MQ/4-copypush/runExample4Sink.cxx b/examples/MQ/4-copypush/runExample4Sink.cxx index 9c5cab08..e3809451 100644 --- a/examples/MQ/4-copypush/runExample4Sink.cxx +++ b/examples/MQ/4-copypush/runExample4Sink.cxx @@ -19,12 +19,6 @@ #include "FairMQProgOptions.h" #include "FairMQExample4Sink.h" -#ifdef NANOMSG -#include "FairMQTransportFactoryNN.h" -#else -#include "FairMQTransportFactoryZMQ.h" -#endif - int main(int argc, char** argv) { FairMQExample4Sink sink; @@ -48,13 +42,7 @@ int main(int argc, char** argv) LOG(INFO) << "PID: " << getpid(); -#ifdef NANOMSG - FairMQTransportFactory* transportFactory = new FairMQTransportFactoryNN(); -#else - FairMQTransportFactory* transportFactory = new FairMQTransportFactoryZMQ(); -#endif - - sink.SetTransport(transportFactory); + sink.SetTransport(config.GetValue("transport")); sink.SetProperty(FairMQExample4Sink::Id, id); diff --git a/examples/MQ/5-req-rep/CMakeLists.txt b/examples/MQ/5-req-rep/CMakeLists.txt index a02fdc3e..bcaeff59 100644 --- a/examples/MQ/5-req-rep/CMakeLists.txt +++ b/examples/MQ/5-req-rep/CMakeLists.txt @@ -10,6 +10,8 @@ configure_file(${CMAKE_SOURCE_DIR}/examples/MQ/5-req-rep/ex5-req-rep.json ${CMAK Set(INCLUDE_DIRECTORIES ${CMAKE_SOURCE_DIR}/fairmq + ${CMAKE_SOURCE_DIR}/fairmq/zeromq + ${CMAKE_SOURCE_DIR}/fairmq/nanomsg ${CMAKE_SOURCE_DIR}/fairmq/devices ${CMAKE_SOURCE_DIR}/fairmq/tools ${CMAKE_SOURCE_DIR}/fairmq/options @@ -19,28 +21,10 @@ Set(INCLUDE_DIRECTORIES Set(SYSTEM_INCLUDE_DIRECTORIES ${Boost_INCLUDE_DIR} + ${ZMQ_INCLUDE_DIR} + ${NANOMSG_INCLUDE_DIR} ) -If(NANOMSG_FOUND) - Set(INCLUDE_DIRECTORIES - ${INCLUDE_DIRECTORIES} - ${CMAKE_SOURCE_DIR}/fairmq/nanomsg - ) - Set(SYSTEM_INCLUDE_DIRECTORIES - ${SYSTEM_INCLUDE_DIRECTORIES} - ${ZMQ_INCLUDE_DIR} - ) -Else(NANOMSG_FOUND) - Set(INCLUDE_DIRECTORIES - ${INCLUDE_DIRECTORIES} - ${CMAKE_SOURCE_DIR}/fairmq/zeromq - ) - Set(SYSTEM_INCLUDE_DIRECTORIES - ${SYSTEM_INCLUDE_DIRECTORIES} - ${ZMQ_INCLUDE_DIR} - ) -EndIf(NANOMSG_FOUND) - Include_Directories(${INCLUDE_DIRECTORIES}) Include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES}) diff --git a/examples/MQ/5-req-rep/runExample5Client.cxx b/examples/MQ/5-req-rep/runExample5Client.cxx index 0010c0bc..e82dfcba 100644 --- a/examples/MQ/5-req-rep/runExample5Client.cxx +++ b/examples/MQ/5-req-rep/runExample5Client.cxx @@ -21,12 +21,6 @@ #include "FairMQProgOptions.h" #include "FairMQExample5Client.h" -#ifdef NANOMSG -#include "FairMQTransportFactoryNN.h" -#else -#include "FairMQTransportFactoryZMQ.h" -#endif - using namespace std; using namespace boost::program_options; @@ -61,13 +55,7 @@ int main(int argc, char** argv) LOG(INFO) << "PID: " << getpid(); -#ifdef NANOMSG - FairMQTransportFactory* transportFactory = new FairMQTransportFactoryNN(); -#else - FairMQTransportFactory* transportFactory = new FairMQTransportFactoryZMQ(); -#endif - - client.SetTransport(transportFactory); + client.SetTransport(config.GetValue("transport")); client.SetProperty(FairMQExample5Client::Id, id); client.SetProperty(FairMQExample5Client::Text, text); diff --git a/examples/MQ/5-req-rep/runExample5Server.cxx b/examples/MQ/5-req-rep/runExample5Server.cxx index 0ec33cdf..2137e2b1 100644 --- a/examples/MQ/5-req-rep/runExample5Server.cxx +++ b/examples/MQ/5-req-rep/runExample5Server.cxx @@ -21,12 +21,6 @@ #include "FairMQProgOptions.h" #include "FairMQExample5Server.h" -#ifdef NANOMSG -#include "FairMQTransportFactoryNN.h" -#else -#include "FairMQTransportFactoryZMQ.h" -#endif - using namespace std; using namespace boost::program_options; @@ -53,13 +47,7 @@ int main(int argc, char** argv) LOG(INFO) << "PID: " << getpid(); -#ifdef NANOMSG - FairMQTransportFactory* transportFactory = new FairMQTransportFactoryNN(); -#else - FairMQTransportFactory* transportFactory = new FairMQTransportFactoryZMQ(); -#endif - - server.SetTransport(transportFactory); + server.SetTransport(config.GetValue("transport")); server.SetProperty(FairMQExample5Server::Id, id); diff --git a/examples/MQ/6-multiple-channels/CMakeLists.txt b/examples/MQ/6-multiple-channels/CMakeLists.txt index c1254925..22441560 100644 --- a/examples/MQ/6-multiple-channels/CMakeLists.txt +++ b/examples/MQ/6-multiple-channels/CMakeLists.txt @@ -10,6 +10,8 @@ configure_file(${CMAKE_SOURCE_DIR}/examples/MQ/6-multiple-channels/ex6-multiple- Set(INCLUDE_DIRECTORIES ${CMAKE_SOURCE_DIR}/fairmq + ${CMAKE_SOURCE_DIR}/fairmq/zeromq + ${CMAKE_SOURCE_DIR}/fairmq/nanomsg ${CMAKE_SOURCE_DIR}/fairmq/devices ${CMAKE_SOURCE_DIR}/fairmq/tools ${CMAKE_SOURCE_DIR}/fairmq/options @@ -19,28 +21,10 @@ Set(INCLUDE_DIRECTORIES Set(SYSTEM_INCLUDE_DIRECTORIES ${Boost_INCLUDE_DIR} + ${ZMQ_INCLUDE_DIR} + ${NANOMSG_INCLUDE_DIR} ) -If(NANOMSG_FOUND) - Set(INCLUDE_DIRECTORIES - ${INCLUDE_DIRECTORIES} - ${CMAKE_SOURCE_DIR}/fairmq/nanomsg - ) - Set(SYSTEM_INCLUDE_DIRECTORIES - ${SYSTEM_INCLUDE_DIRECTORIES} - ${ZMQ_INCLUDE_DIR} - ) -Else(NANOMSG_FOUND) - Set(INCLUDE_DIRECTORIES - ${INCLUDE_DIRECTORIES} - ${CMAKE_SOURCE_DIR}/fairmq/zeromq - ) - Set(SYSTEM_INCLUDE_DIRECTORIES - ${SYSTEM_INCLUDE_DIRECTORIES} - ${ZMQ_INCLUDE_DIR} - ) -EndIf(NANOMSG_FOUND) - Include_Directories(${INCLUDE_DIRECTORIES}) Include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES}) diff --git a/examples/MQ/6-multiple-channels/runExample6Broadcaster.cxx b/examples/MQ/6-multiple-channels/runExample6Broadcaster.cxx index 0f719a28..9d702bf8 100644 --- a/examples/MQ/6-multiple-channels/runExample6Broadcaster.cxx +++ b/examples/MQ/6-multiple-channels/runExample6Broadcaster.cxx @@ -19,12 +19,6 @@ #include "FairMQProgOptions.h" #include "FairMQExample6Broadcaster.h" -#ifdef NANOMSG -#include "FairMQTransportFactoryNN.h" -#else -#include "FairMQTransportFactoryZMQ.h" -#endif - int main(int argc, char** argv) { FairMQExample6Broadcaster broadcaster; @@ -48,13 +42,7 @@ int main(int argc, char** argv) LOG(INFO) << "PID: " << getpid(); -#ifdef NANOMSG - FairMQTransportFactory* transportFactory = new FairMQTransportFactoryNN(); -#else - FairMQTransportFactory* transportFactory = new FairMQTransportFactoryZMQ(); -#endif - - broadcaster.SetTransport(transportFactory); + broadcaster.SetTransport(config.GetValue("transport")); broadcaster.SetProperty(FairMQExample6Broadcaster::Id, id); diff --git a/examples/MQ/6-multiple-channels/runExample6Sampler.cxx b/examples/MQ/6-multiple-channels/runExample6Sampler.cxx index 11759ebc..27f7db44 100644 --- a/examples/MQ/6-multiple-channels/runExample6Sampler.cxx +++ b/examples/MQ/6-multiple-channels/runExample6Sampler.cxx @@ -21,12 +21,6 @@ #include "FairMQProgOptions.h" #include "FairMQExample6Sampler.h" -#ifdef NANOMSG -#include "FairMQTransportFactoryNN.h" -#else -#include "FairMQTransportFactoryZMQ.h" -#endif - using namespace boost::program_options; int main(int argc, char** argv) @@ -60,13 +54,7 @@ int main(int argc, char** argv) LOG(INFO) << "PID: " << getpid(); -#ifdef NANOMSG - FairMQTransportFactory* transportFactory = new FairMQTransportFactoryNN(); -#else - FairMQTransportFactory* transportFactory = new FairMQTransportFactoryZMQ(); -#endif - - sampler.SetTransport(transportFactory); + sampler.SetTransport(config.GetValue("transport")); sampler.SetProperty(FairMQExample6Sampler::Id, id); sampler.SetProperty(FairMQExample6Sampler::Text, text); diff --git a/examples/MQ/6-multiple-channels/runExample6Sink.cxx b/examples/MQ/6-multiple-channels/runExample6Sink.cxx index 4c8b1447..66ab1d61 100644 --- a/examples/MQ/6-multiple-channels/runExample6Sink.cxx +++ b/examples/MQ/6-multiple-channels/runExample6Sink.cxx @@ -21,12 +21,6 @@ #include "FairMQProgOptions.h" #include "FairMQExample6Sink.h" -#ifdef NANOMSG -#include "FairMQTransportFactoryNN.h" -#else -#include "FairMQTransportFactoryZMQ.h" -#endif - using namespace boost::program_options; int main(int argc, char** argv) @@ -52,13 +46,7 @@ int main(int argc, char** argv) LOG(INFO) << "PID: " << getpid(); -#ifdef NANOMSG - FairMQTransportFactory* transportFactory = new FairMQTransportFactoryNN(); -#else - FairMQTransportFactory* transportFactory = new FairMQTransportFactoryZMQ(); -#endif - - sink.SetTransport(transportFactory); + sink.SetTransport(config.GetValue("transport")); sink.SetProperty(FairMQExample6Sink::Id, id); diff --git a/examples/MQ/8-multipart/CMakeLists.txt b/examples/MQ/8-multipart/CMakeLists.txt index 4d9d91a9..eeefc0ec 100644 --- a/examples/MQ/8-multipart/CMakeLists.txt +++ b/examples/MQ/8-multipart/CMakeLists.txt @@ -10,6 +10,8 @@ configure_file(${CMAKE_SOURCE_DIR}/examples/MQ/8-multipart/ex8-multipart.json ${ Set(INCLUDE_DIRECTORIES ${CMAKE_SOURCE_DIR}/fairmq + ${CMAKE_SOURCE_DIR}/fairmq/zeromq + ${CMAKE_SOURCE_DIR}/fairmq/nanomsg ${CMAKE_SOURCE_DIR}/fairmq/devices ${CMAKE_SOURCE_DIR}/fairmq/tools ${CMAKE_SOURCE_DIR}/fairmq/options @@ -19,28 +21,10 @@ Set(INCLUDE_DIRECTORIES Set(SYSTEM_INCLUDE_DIRECTORIES ${Boost_INCLUDE_DIR} + ${ZMQ_INCLUDE_DIR} + ${NANOMSG_INCLUDE_DIR} ) -If(NANOMSG_FOUND) - Set(INCLUDE_DIRECTORIES - ${INCLUDE_DIRECTORIES} - ${CMAKE_SOURCE_DIR}/fairmq/nanomsg - ) - Set(SYSTEM_INCLUDE_DIRECTORIES - ${SYSTEM_INCLUDE_DIRECTORIES} - ${ZMQ_INCLUDE_DIR} - ) -Else(NANOMSG_FOUND) - Set(INCLUDE_DIRECTORIES - ${INCLUDE_DIRECTORIES} - ${CMAKE_SOURCE_DIR}/fairmq/zeromq - ) - Set(SYSTEM_INCLUDE_DIRECTORIES - ${SYSTEM_INCLUDE_DIRECTORIES} - ${ZMQ_INCLUDE_DIR} - ) -EndIf(NANOMSG_FOUND) - Include_Directories(${INCLUDE_DIRECTORIES}) Include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES}) diff --git a/examples/MQ/8-multipart/runExample8Sampler.cxx b/examples/MQ/8-multipart/runExample8Sampler.cxx index 3dbeca4a..3c22e01d 100644 --- a/examples/MQ/8-multipart/runExample8Sampler.cxx +++ b/examples/MQ/8-multipart/runExample8Sampler.cxx @@ -21,12 +21,6 @@ #include "FairMQProgOptions.h" #include "FairMQExample8Sampler.h" -#ifdef NANOMSG -#include "FairMQTransportFactoryNN.h" -#else -#include "FairMQTransportFactoryZMQ.h" -#endif - using namespace boost::program_options; int main(int argc, char** argv) @@ -52,13 +46,7 @@ int main(int argc, char** argv) LOG(INFO) << "PID: " << getpid(); -#ifdef NANOMSG - FairMQTransportFactory* transportFactory = new FairMQTransportFactoryNN(); -#else - FairMQTransportFactory* transportFactory = new FairMQTransportFactoryZMQ(); -#endif - - sampler.SetTransport(transportFactory); + sampler.SetTransport(config.GetValue("transport")); sampler.SetProperty(FairMQExample8Sampler::Id, id); diff --git a/examples/MQ/8-multipart/runExample8Sink.cxx b/examples/MQ/8-multipart/runExample8Sink.cxx index 70e1f253..a28bd071 100644 --- a/examples/MQ/8-multipart/runExample8Sink.cxx +++ b/examples/MQ/8-multipart/runExample8Sink.cxx @@ -19,12 +19,6 @@ #include "FairMQProgOptions.h" #include "FairMQExample8Sink.h" -#ifdef NANOMSG -#include "FairMQTransportFactoryNN.h" -#else -#include "FairMQTransportFactoryZMQ.h" -#endif - int main(int argc, char** argv) { FairMQExample8Sink sink; @@ -48,13 +42,7 @@ int main(int argc, char** argv) LOG(INFO) << "PID: " << getpid(); -#ifdef NANOMSG - FairMQTransportFactory* transportFactory = new FairMQTransportFactoryNN(); -#else - FairMQTransportFactory* transportFactory = new FairMQTransportFactoryZMQ(); -#endif - - sink.SetTransport(transportFactory); + sink.SetTransport(config.GetValue("transport")); sink.SetProperty(FairMQExample8Sink::Id, id);