Merge remote-tracking branch 'upstream/master'

Author: sy-c

CMakeLists.txt

@@ -67,14 +67,15 @@ include_directories(
         ${Boost_INCLUDE_DIRS}
         ${Monitoring_INCLUDE_DIRS}
         ${FAIRROOT_INCLUDE_DIR}
-        ${FAIRROOT_INCLUDE_DIR}/fairmq
+        ${_fairmq_incdir}
+        ${_fairlogger_incdir}
         ${ZeroMQ_INCLUDE_DIR}
         ${Common_INCLUDE_DIRS}
         ${Configuration_INCLUDE_DIRS}
         ${InfoLogger_INCLUDE_DIRS}
         ${ReadoutCard_INCLUDE_DIRS}
         ${DataSampling_INCLUDE_DIRS}
-        ${Numa_INCLUDE_DIRS}       
+        ${Numa_INCLUDE_DIRS}
 )
 
 add_library(

cmake/FindFairMQInFairRoot.cmake

@@ -0,0 +1,54 @@
+# DEPRECATED: Remove this file, once we require FairMQ 1.2+
+#
+# Simple check for availability of FairMQ
+#
+# The FairMQ module of FairRoot might be disabled in the built of FairRoot
+# due to missing dependencies, e.g ZeroMQ and boost. Those dependencies
+# also have to be available in the required (minimal) version.
+#
+
+if(FairRoot_DIR)
+  set(FAIRROOTPATH ${FairRoot_DIR})
+else()
+  set(FAIRROOTPATH $ENV{FAIRROOTPATH})
+endif(FairRoot_DIR)
+
+if(FAIRROOTPATH)
+  if(NOT FairMQInFairRoot_FIND_QUIETLY)
+  MESSAGE(STATUS "FairRoot ... - found ${FAIRROOTPATH}")
+  endif(NOT FairMQInFairRoot_FIND_QUIETLY)
+else()
+  if(NOT FairMQInFairRoot_FIND_QUIETLY)
+  MESSAGE(FATAL_ERROR "FairRoot installation not found")
+  endif(NOT FairMQInFairRoot_FIND_QUIETLY)
+endif(FAIRROOTPATH)
+
+set(FAIRMQ_REQUIRED_HEADERS FairMQDevice.h)
+if(NOT FairMQInFairRoot_FIND_QUIETLY)
+  message(STATUS "Looking for FairMQ functionality in FairRoot ...")
+endif(NOT FairMQInFairRoot_FIND_QUIETLY)
+
+find_path(FAIRMQ_INCLUDE_DIR NAMES ${FAIRMQ_REQUIRED_HEADERS}
+  PATHS ${FAIRROOTPATH}/include/fairmq
+  NO_DEFAULT_PATH
+)
+
+# search once more in the system if not yet found
+find_path(FAIRMQ_INCLUDE_DIR NAMES ${FAIRMQ_REQUIRED_HEADERS}
+)
+
+if(FAIRMQ_INCLUDE_DIR)
+  if(NOT FairMQInFairRoot_FIND_QUIETLY)
+    message(STATUS "Looking for FairMQ functionality in FairRoot: yes")
+  endif(NOT FairMQInFairRoot_FIND_QUIETLY)
+  set(FAIRMQ_FOUND TRUE)
+  set(FairMQInFairRoot_FOUND TRUE)
+else(FAIRMQ_INCLUDE_DIR)
+  if(FairMQInFairRoot_FIND_REQUIRED)
+    message(FATAL_ERROR "FairRoot is not built with FairMQ support")
+  else(FairMQInFairRoot_FIND_REQUIRED)
+    if(NOT FairMQInFairRoot_FIND_QUIETLY)
+      message(STATUS "Looking for FairMQ functionality in FairRoot: no")
+    endif(NOT FairMQInFairRoot_FIND_QUIETLY)
+  endif(FairMQInFairRoot_FIND_REQUIRED)
+endif(FAIRMQ_INCLUDE_DIR)

cmake/FindMonitoring.cmake

@@ -21,7 +21,7 @@ include(FindPackageHandleStandardArgs)
 
 # find includes
 find_path(MONITORING_INCLUDE_DIR Monitoring.h
-           HINTS ${Monitoring_ROOT}/include ENV LD_LIBRARY_PATH PATH_SUFFIXES "../include/Monitoring" "../../include/Monitoring" )
+        HINTS ${Monitoring_ROOT}/include ENV LD_LIBRARY_PATH PATH_SUFFIXES "../include/Monitoring" "../../include/Monitoring" )
 
 # Remove the final "Monitoring"
 get_filename_component(MONITORING_INCLUDE_DIR ${MONITORING_INCLUDE_DIR} DIRECTORY)
@@ -34,7 +34,7 @@ set(Monitoring_LIBRARIES ${MONITORING_LIBRARY})
 # handle the QUIETLY and REQUIRED arguments and set Monitoring_FOUND to TRUE
 # if all listed variables are TRUE
 find_package_handle_standard_args(Monitoring  "Monitoring could not be found. Set Monitoring_ROOT as root installation directory."
-                                  MONITORING_LIBRARY MONITORING_INCLUDE_DIR)
+        MONITORING_LIBRARY MONITORING_INCLUDE_DIR)
 if(${Monitoring_FOUND})
     set(Monitoring_DEFINITIONS "")
     message(STATUS "Monitoring found : ${Monitoring_LIBRARIES}")

cmake/ReadoutDependencies.cmake

@@ -1,6 +1,5 @@
-find_package(Boost COMPONENTS unit_test_framework program_options system REQUIRED)
+find_package(Boost COMPONENTS unit_test_framework program_options system thread system timer program_options random filesystem regex signals REQUIRED)
 find_package(Git QUIET)
-find_package(FairRoot)
 find_package(Monitoring REQUIRED)
 find_package(Configuration REQUIRED)
 find_package(Common REQUIRED)
@@ -10,17 +9,45 @@ find_package(DataSampling REQUIRED)
 find_package(ZeroMQ REQUIRED)
 find_package(Numa)
 
+find_package(FairRoot)
 if (FAIRROOT_FOUND)
+    find_package(FairMQInFairRoot) # DEPRECATED: This looks for FairMQ embedded in old FairRoot versions,
+    # before FairMQ and FairLogger have moved to separate repos.
+    # Remove this line, once we require FairMQ 1.2+.
+    if(NOT FairMQInFairRoot_FOUND) # DEPRECATED: Remove this condition, once we require FairMQ 1.2+
+        find_package(FairMQ REQUIRED)
+        find_package(FairLogger REQUIRED)
+    endif()
     # this should go away when fairrot provides a proper Find script or proper config scripts
     # See : http://www.cmake.org/cmake/help/v3.0/command/link_directories.html
     link_directories(${FAIRROOT_LIBRARY_DIR})
-    set(FAIRROOT_LIBRARIES Base FairMQ BaseMQ Logger)
     ADD_DEFINITIONS(-DWITH_FAIRMQ)
+    get_target_property(_boost_incdir Boost::boost INTERFACE_INCLUDE_DIRECTORIES)
+
+    if(FairMQInFairRoot_FOUND)
+        # DEPRECATED: Remove this case, once we require FairMQ 1.2+
+        get_target_property(_fairmq_incdir FairRoot::FairMQ INTERFACE_INCLUDE_DIRECTORIES)
+        o2_define_bucket(NAME fairmq_bucket
+                DEPENDENCIES FairRoot::FairMQ
+                INCLUDE_DIRECTORIES ${_boost_incdir} ${_fairmq_incdir}
+                )
+    else()
+        get_target_property(_fairmq_incdir FairMQ::FairMQ INTERFACE_INCLUDE_DIRECTORIES)
+        get_target_property(_fairlogger_incdir FairLogger::FairLogger INTERFACE_INCLUDE_DIRECTORIES)
+        o2_define_bucket(NAME fairmq_bucket
+                DEPENDENCIES FairMQ::FairMQ
+                INCLUDE_DIRECTORIES ${_boost_incdir} ${_fairmq_incdir} ${_fairlogger_incdir}
+                )
+        #set(_fairlogger_incdir)
+    endif()
 else (FAIRROOT_FOUND)
     message(WARNING "FairRoot not found, corresponding classes will not be compiled.")
+    o2_define_bucket(NAME fairmq_bucket
+            INCLUDE_DIRECTORIES ${_boost_incdir}
+            )
 endif (FAIRROOT_FOUND)
 
-if (Numa_FOUND)   
+if (Numa_FOUND)
   ADD_DEFINITIONS(-DWITH_NUMA)
 else (Numa_FOUND)
   message(WARNING "Numa not found, corresponding features will be disabled.")
@@ -65,8 +92,8 @@ o2_define_bucket(
 
         DEPENDENCIES
         o2_readout_bucket
-        ${FAIRROOT_LIBRARIES}
         ${ROOT_LIBRARIES}
+        fairmq_bucket
 
         SYSTEMINCLUDE_DIRECTORIES
         ${FAIRROOT_INCLUDE_DIR}

src/ConsumerFMQ.cxx

@@ -6,7 +6,6 @@
 #include <fairmq/FairMQDevice.h>
 #include <fairmq/FairMQMessage.h>
 #include <fairmq/FairMQTransportFactory.h>
-#include <fairmq/zeromq/FairMQTransportFactoryZMQ.h>
 
 
 class FMQSender : public FairMQDevice
@@ -16,8 +15,8 @@ class FMQSender : public FairMQDevice
     FMQSender() { }
     ~FMQSender() { }
 
-  protected:   
-    
+  protected:
+
     void Run() override {
        while (CheckCurrentState(RUNNING)) {
          //printf("loop Run()\n");
@@ -45,39 +44,39 @@ class ConsumerFMQ: public Consumer {
     FMQSender sender;
 
 
- // todo: check why this type is not public in FMQ interface?  
-    typedef std::unordered_map<std::string, std::vector<FairMQChannel>> FairMQMap;   
+ // todo: check why this type is not public in FMQ interface?
+    typedef std::unordered_map<std::string, std::vector<FairMQChannel>> FairMQMap;
     FairMQMap m;
-    
-    FairMQTransportFactory *transportFactory;
-        
-  public: 
+
+    std::shared_ptr<FairMQTransportFactory> transportFactory;
+
+  public:
 
 
   ConsumerFMQ(ConfigFile &cfg, std::string cfgEntryPoint) : Consumer(cfg,cfgEntryPoint), channels(1) {
-       
+
     channels[0].UpdateType("pair");  // pub or push?
     channels[0].UpdateMethod("bind");
     channels[0].UpdateAddress("ipc:///tmp/readout-pipe-0");
-    channels[0].UpdateRateLogging(0);    
-    channels[0].UpdateSndBufSize(10);    
+    channels[0].UpdateRateLogging(0);
+    channels[0].UpdateSndBufSize(10);
     if (!channels[0].ValidateChannel()) {
       throw "ConsumerFMQ: channel validation failed";
     }
 
 
     // todo: def "data-out" as const string to name output channel to which we will push
     m.emplace(std::string("data-out"),channels);
-    
+
     for (auto it : m) {
       std::cout << it.first << " = " << it.second.size() << " channels  " << std::endl;
       for (auto ch : it.second) {
         std::cout << ch.GetAddress() <<std::endl;
       }
     }
 
-    transportFactory = new FairMQTransportFactoryZMQ();
-      
+    transportFactory = FairMQTransportFactory::CreateTransportFactory("zeromq");
+
     sender.fChannels = m;
     sender.SetTransport("zeromq");
     sender.ChangeState(FairMQStateMachine::Event::INIT_DEVICE);
@@ -88,18 +87,16 @@ class ConsumerFMQ: public Consumer {
 
 //    sender.InteractiveStateLoop();
   }
-  
+
   ~ConsumerFMQ() {
     sender.ChangeState(FairMQStateMachine::Event::STOP);
     sender.ChangeState(FairMQStateMachine::Event::RESET_TASK);
     sender.WaitForEndOfState(FairMQStateMachine::Event::RESET_TASK);
     sender.ChangeState(FairMQStateMachine::Event::RESET_DEVICE);
     sender.WaitForEndOfState(FairMQStateMachine::Event::RESET_DEVICE);
     sender.ChangeState(FairMQStateMachine::Event::END);
-    
-    delete transportFactory;       
   }
-  
+
   int pushData(DataBlockContainerReference &b) {
 
     // we create a copy of the reference, in a newly allocated object, so that reference is kept alive until this new object is destroyed in the cleanupCallback
@@ -109,7 +106,7 @@ class ConsumerFMQ: public Consumer {
 
     sender.fChannels.at("data-out").at(0).Send(msgHeader);
     sender.fChannels.at("data-out").at(0).Send(msgBody);
-    
+
 
 
     // how to know if it was a success?
@@ -120,7 +117,7 @@ class ConsumerFMQ: public Consumer {
 
     // use multipart?
     // channels.at("data-out").at(0).SendPart(msgBody);
-    
+
     return 0;
   }
   private: