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<std::string>("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.

fairmq/test/CMakeLists.txt

@@ -12,6 +12,8 @@ configure_file(${CMAKE_SOURCE_DIR}/fairmq/test/test-fairmq-req-rep.sh.in ${CMAKE
 
 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
@@ -24,28 +26,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})
 

fairmq/test/pub-sub/runTestPub.cxx

@@ -12,27 +12,14 @@
  * @author A. Rybalchenko
  */
 
-
-
 #include "FairMQLogger.h"
 #include "FairMQTestPub.h"
 
-#ifdef NANOMSG
-#include "FairMQTransportFactoryNN.h"
-#else
-#include "FairMQTransportFactoryZMQ.h"
-#endif
-
 int main(int argc, char** argv)
 {
     FairMQTestPub testPub;
     testPub.CatchSignals();
-
-#ifdef NANOMSG
-    testPub.SetTransport(new FairMQTransportFactoryNN());
-#else
-    testPub.SetTransport(new FairMQTransportFactoryZMQ());
-#endif
+    testPub.SetTransport("zeromq");
 
     testPub.SetProperty(FairMQTestPub::Id, "testPub");
 

fairmq/test/pub-sub/runTestSub.cxx

@@ -17,22 +17,11 @@
 #include "FairMQLogger.h"
 #include "FairMQTestSub.h"
 
-#ifdef NANOMSG
-#include "FairMQTransportFactoryNN.h"
-#else
-#include "FairMQTransportFactoryZMQ.h"
-#endif
-
 int main(int argc, char** argv)
 {
     FairMQTestSub testSub;
     testSub.CatchSignals();
-
-#ifdef NANOMSG
-    testSub.SetTransport(new FairMQTransportFactoryNN());
-#else
-    testSub.SetTransport(new FairMQTransportFactoryZMQ());
-#endif
+    testSub.SetTransport("zeromq");
 
     testSub.SetProperty(FairMQTestSub::Id, "testSub_" + std::to_string(getpid()));
 

fairmq/test/push-pull/runTestPull.cxx

@@ -15,22 +15,11 @@
 #include "FairMQLogger.h"
 #include "FairMQTestPull.h"
 
-#ifdef NANOMSG
-#include "FairMQTransportFactoryNN.h"
-#else
-#include "FairMQTransportFactoryZMQ.h"
-#endif
-
 int main(int argc, char** argv)
 {
     FairMQTestPull testPull;
     testPull.CatchSignals();
-
-#ifdef NANOMSG
-    testPull.SetTransport(new FairMQTransportFactoryNN());
-#else
-    testPull.SetTransport(new FairMQTransportFactoryZMQ());
-#endif
+    testPull.SetTransport("zeromq");
 
     testPull.SetProperty(FairMQTestPull::Id, "testPull");
 

fairmq/test/push-pull/runTestPush.cxx

@@ -15,22 +15,11 @@
 #include "FairMQLogger.h"
 #include "FairMQTestPush.h"
 
-#ifdef NANOMSG
-#include "FairMQTransportFactoryNN.h"
-#else
-#include "FairMQTransportFactoryZMQ.h"
-#endif
-
 int main(int argc, char** argv)
 {
     FairMQTestPush testPush;
     testPush.CatchSignals();
-
-#ifdef NANOMSG
-    testPush.SetTransport(new FairMQTransportFactoryNN());
-#else
-    testPush.SetTransport(new FairMQTransportFactoryZMQ());
-#endif
+    testPush.SetTransport("zeromq");
 
     testPush.SetProperty(FairMQTestPush::Id, "testPush");
 

fairmq/test/req-rep/runTestRep.cxx

@@ -17,22 +17,11 @@
 #include "FairMQLogger.h"
 #include "FairMQTestRep.h"
 
-#ifdef NANOMSG
-#include "FairMQTransportFactoryNN.h"
-#else
-#include "FairMQTransportFactoryZMQ.h"
-#endif
-
 int main(int argc, char** argv)
 {
     FairMQTestRep testRep;
     testRep.CatchSignals();
-
-#ifdef NANOMSG
-    testRep.SetTransport(new FairMQTransportFactoryNN());
-#else
-    testRep.SetTransport(new FairMQTransportFactoryZMQ());
-#endif
+    testRep.SetTransport("zeromq");
 
     testRep.SetProperty(FairMQTestRep::Id, "testRep");
 

fairmq/test/req-rep/runTestReq.cxx

@@ -17,22 +17,11 @@
 #include "FairMQLogger.h"
 #include "FairMQTestReq.h"
 
-#ifdef NANOMSG
-#include "FairMQTransportFactoryNN.h"
-#else
-#include "FairMQTransportFactoryZMQ.h"
-#endif
-
 int main(int argc, char** argv)
 {
     FairMQTestReq testReq;
     testReq.CatchSignals();
-
-#ifdef NANOMSG
-    testReq.SetTransport(new FairMQTransportFactoryNN());
-#else
-    testReq.SetTransport(new FairMQTransportFactoryZMQ());
-#endif
+    testReq.SetTransport("zeromq");
 
     testReq.SetProperty(FairMQTestReq::Id, "testReq");
 

fairmq/test/runTransferTimeoutTest.cxx

@@ -15,12 +15,6 @@
 #include "FairMQLogger.h"
 #include "FairMQDevice.h"
 
-#ifdef NANOMSG
-#include "FairMQTransportFactoryNN.h"
-#else
-#include "FairMQTransportFactoryZMQ.h"
-#endif
-
 class TransferTimeoutTester : public FairMQDevice
 {
   public:
@@ -98,12 +92,7 @@ int main(int argc, char** argv)
 {
     TransferTimeoutTester timeoutTester;
     timeoutTester.CatchSignals();
-
-#ifdef NANOMSG
-    timeoutTester.SetTransport(new FairMQTransportFactoryNN());
-#else
-    timeoutTester.SetTransport(new FairMQTransportFactoryZMQ());
-#endif
+    timeoutTester.SetTransport("zeromq");
 
     timeoutTester.SetProperty(TransferTimeoutTester::Id, "timeoutTester");