From 2d7fb1803f41e6daf5d02c16b59dac651cc80aa7 Mon Sep 17 00:00:00 2001 From: Carlos Date: Wed, 23 Jun 2021 08:26:54 +0100 Subject: [PATCH] changing zeromq dependency, and updating deprecated socket option (#122) --- cmake/ExternalProjects.cmake | 3 ++- src/transport/MessageEndpoint.cpp | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cmake/ExternalProjects.cmake b/cmake/ExternalProjects.cmake index 9d3558100..486164d02 100644 --- a/cmake/ExternalProjects.cmake +++ b/cmake/ExternalProjects.cmake @@ -122,12 +122,13 @@ ExternalProject_Add(libzeromq_ext GIT_REPOSITORY "https://github.com/zeromq/libzmq.git" GIT_TAG "v4.3.4" CMAKE_CACHE_ARGS "-DCMAKE_INSTALL_PREFIX:STRING=${CMAKE_INSTALL_PREFIX}" + "-DCMAKE_BUILD_TESTS:BOOL=OFF" BUILD_BYPRODUCTS ${ZEROMQ_LIBRARY} ) ExternalProject_Get_Property(libzeromq_ext SOURCE_DIR) set(LIBZEROMQ_INCLUDE_DIR ${SOURCE_DIR}) ExternalProject_Add(cppzeromq_ext - GIT_REPOSITORY "https://github.com/faasm/cppzmq.git" + GIT_REPOSITORY "https://github.com/zeromq/cppzmq.git" GIT_TAG "v4.7.1" CMAKE_CACHE_ARGS "-DCPPZMQ_BUILD_TESTS:BOOL=OFF" "-DCMAKE_INSTALL_PREFIX:STRING=${CMAKE_INSTALL_PREFIX}" diff --git a/src/transport/MessageEndpoint.cpp b/src/transport/MessageEndpoint.cpp index 07059f87d..f122a680b 100644 --- a/src/transport/MessageEndpoint.cpp +++ b/src/transport/MessageEndpoint.cpp @@ -81,8 +81,8 @@ void MessageEndpoint::open(faabric::transport::MessageContext& context, } // Set socket options - this->socket->setsockopt(ZMQ_RCVTIMEO, recvTimeoutMs); - this->socket->setsockopt(ZMQ_SNDTIMEO, sendTimeoutMs); + this->socket->set(zmq::sockopt::rcvtimeo, recvTimeoutMs); + this->socket->set(zmq::sockopt::sndtimeo, recvTimeoutMs); } void MessageEndpoint::send(uint8_t* serialisedMsg, size_t msgSize, bool more)