Fix race condition in the control plugin

Support msgpack 3.x
Fixes #32
2025-10-15 09:31:45 +00:00 · 2018-09-12 16:14:32 +02:00 · 2018-07-18 16:13:18 +02:00 · 2018-06-19 14:08:32 +02:00 · 2018-06-18 15:26:31 +02:00
5 changed files with 25 additions and 18 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -48,7 +48,11 @@ endif()

 if(BUILD_NANOMSG_TRANSPORT)
  find_package2(PRIVATE nanomsg VERSION 1.0.0 REQUIRED)
-  find_package2(PRIVATE msgpack VERSION 2.1.5 REQUIRED)
+  find_package2(PRIVATE msgpack VERSION 3.0.0)
+  set(PROJECT_msgpack_VERSION 2.1.5)
+  if(NOT msgpack_FOUND)
+    find_package2(PRIVATE msgpack VERSION 2.1.5 REQUIRED)
+  endif()
  set(msgpack_ROOT ${PACKAGE_PREFIX_DIR})
 endif()

--- a/1
+++ b/1
@@ -2,6 +2,7 @@ Aphecetche, Laurent
 Binet, Sebastien
 Eulisse, Giulio
 Karabowicz, Radoslaw
+Kretz, Matthias <kretz@kde.org>
 Krzewicki, Mikolaj 
 Neskovic, Gvozden
 Richter, Matthias
--- a/cmake/FairMQLib.cmake
+++ b/cmake/FairMQLib.cmake
@@ -280,20 +280,22 @@ macro(find_package2 qualifier pkgname)
  set(CMAKE_PREFIX_PATH ${old_CPP})
  unset(old_CPP)

-  if(${qualifier} STREQUAL PRIVATE)
-    set(PROJECT_${pkgname}_VERSION ${ARGS_VERSION})
-    set(PROJECT_${pkgname}_COMPONENTS ${ARGS_COMPONENTS})
-    set(PROJECT_PACKAGE_DEPENDENCIES ${PROJECT_PACKAGE_DEPENDENCIES} ${pkgname})
-  elseif(${qualifier} STREQUAL PUBLIC)
-    set(PROJECT_${pkgname}_VERSION ${ARGS_VERSION})
-    set(PROJECT_${pkgname}_COMPONENTS ${ARGS_COMPONENTS})
-    set(PROJECT_PACKAGE_DEPENDENCIES ${PROJECT_PACKAGE_DEPENDENCIES} ${pkgname})
-    set(PROJECT_INTERFACE_${pkgname}_VERSION ${ARGS_VERSION})
-    set(PROJECT_INTERFACE_${pkgname}_COMPONENTS ${ARGS_COMPONENTS})
-    set(PROJECT_INTERFACE_PACKAGE_DEPENDENCIES ${PROJECT_INTERFACE_PACKAGE_DEPENDENCIES} ${pkgname})
-  elseif(${qualifier} STREQUAL INTERFACE)
-    set(PROJECT_INTERFACE_${pkgname}_VERSION ${ARGS_VERSION})
-    set(PROJECT_INTERFACE_${pkgname}_COMPONENTS ${ARGS_COMPONENTS})
-    set(PROJECT_INTERFACE_PACKAGE_DEPENDENCIES ${PROJECT_INTERFACE_PACKAGE_DEPENDENCIES} ${pkgname})
+  if(${pkgname}_FOUND)
+    if(${qualifier} STREQUAL PRIVATE)
+      set(PROJECT_${pkgname}_VERSION ${ARGS_VERSION})
+      set(PROJECT_${pkgname}_COMPONENTS ${ARGS_COMPONENTS})
+      set(PROJECT_PACKAGE_DEPENDENCIES ${PROJECT_PACKAGE_DEPENDENCIES} ${pkgname})
+    elseif(${qualifier} STREQUAL PUBLIC)
+      set(PROJECT_${pkgname}_VERSION ${ARGS_VERSION})
+      set(PROJECT_${pkgname}_COMPONENTS ${ARGS_COMPONENTS})
+      set(PROJECT_PACKAGE_DEPENDENCIES ${PROJECT_PACKAGE_DEPENDENCIES} ${pkgname})
+      set(PROJECT_INTERFACE_${pkgname}_VERSION ${ARGS_VERSION})
+      set(PROJECT_INTERFACE_${pkgname}_COMPONENTS ${ARGS_COMPONENTS})
+      set(PROJECT_INTERFACE_PACKAGE_DEPENDENCIES ${PROJECT_INTERFACE_PACKAGE_DEPENDENCIES} ${pkgname})
+    elseif(${qualifier} STREQUAL INTERFACE)
+      set(PROJECT_INTERFACE_${pkgname}_VERSION ${ARGS_VERSION})
+      set(PROJECT_INTERFACE_${pkgname}_COMPONENTS ${ARGS_COMPONENTS})
+      set(PROJECT_INTERFACE_PACKAGE_DEPENDENCIES ${PROJECT_INTERFACE_PACKAGE_DEPENDENCIES} ${pkgname})
+    endif()
  endif()
 endmacro()
--- a/fairmq/FairMQChannel.cxx
+++ b/fairmq/FairMQChannel.cxx
@@ -499,7 +499,7 @@ bool FairMQChannel::ValidateChannel()
        else
        {
            vector<string> endpoints;
-            boost::algorithm::split(endpoints, fAddress, boost::algorithm::is_any_of(","));
+            boost::algorithm::split(endpoints, fAddress, boost::algorithm::is_any_of(";"));
            for (const auto endpoint : endpoints)
            {
                string address;
--- a/fairmq/plugins/Control.cxx
+++ b/fairmq/plugins/Control.cxx
@@ -227,7 +227,7 @@ auto Control::WaitForNextState() -> DeviceState
    unique_lock<mutex> lock{fEventsMutex};
    while (fEvents.empty())
    {
-        fNewEvent.wait(lock);
+        fNewEvent.wait_for(lock, chrono::milliseconds(50));
    }

    auto result = fEvents.front();
Author	SHA1	Message	Date
Alexey Rybalchenko	e642262468	Fix race condition in the control plugin	2018-09-12 16:14:32 +02:00
Dennis Klein	9bab3f9f4c	Support msgpack 3.x Fixes #32	2018-07-18 16:13:18 +02:00
Dennis Klein	ee3a84ce7a	Add Matthias as CONTRIBUTOR To acknowledge his countless hours of consulting which benefited this project significantly.	2018-06-19 14:08:32 +02:00
mkrzewic	f05118f4eb	Make ";" the separateor in multi-point channel config This is to avoid parsing problems using "," in e.g. multi-point configuration using Suboptparser	2018-06-18 15:26:31 +02:00