aboutsummaryrefslogtreecommitdiffstats
path: root/gr-zeromq
diff options
context:
space:
mode:
Diffstat (limited to 'gr-zeromq')
-rw-r--r--gr-zeromq/lib/pub_msg_sink_impl.cc4
-rw-r--r--gr-zeromq/lib/pub_msg_sink_impl.h2
-rw-r--r--gr-zeromq/lib/pub_sink_impl.h3
-rw-r--r--gr-zeromq/lib/pull_msg_source_impl.h4
-rw-r--r--gr-zeromq/lib/pull_source_impl.h3
-rw-r--r--gr-zeromq/lib/push_msg_sink_impl.cc4
-rw-r--r--gr-zeromq/lib/push_msg_sink_impl.h2
-rw-r--r--gr-zeromq/lib/push_sink_impl.h3
-rw-r--r--gr-zeromq/lib/rep_msg_sink_impl.cc4
-rw-r--r--gr-zeromq/lib/rep_msg_sink_impl.h4
-rw-r--r--gr-zeromq/lib/rep_sink_impl.h2
-rw-r--r--gr-zeromq/lib/req_msg_source_impl.h4
-rw-r--r--gr-zeromq/lib/req_source_impl.cc4
-rw-r--r--gr-zeromq/lib/req_source_impl.h3
-rw-r--r--gr-zeromq/lib/sub_msg_source_impl.h4
-rw-r--r--gr-zeromq/lib/sub_source_impl.h3
-rw-r--r--gr-zeromq/lib/tag_headers.cc2
-rw-r--r--gr-zeromq/lib/tag_headers.h2
18 files changed, 34 insertions, 23 deletions
diff --git a/gr-zeromq/lib/pub_msg_sink_impl.cc b/gr-zeromq/lib/pub_msg_sink_impl.cc
index 0fb26ada7..d8ec13043 100644
--- a/gr-zeromq/lib/pub_msg_sink_impl.cc
+++ b/gr-zeromq/lib/pub_msg_sink_impl.cc
@@ -73,7 +73,11 @@ void pub_msg_sink_impl::handler(pmt::pmt_t msg)
zmq::message_t zmsg(s.size());
memcpy(zmsg.data(), s.c_str(), s.size());
+#if USE_NEW_CPPZMQ_SEND_RECV
+ d_socket->send(zmsg, zmq::send_flags::none);
+#else
d_socket->send(zmsg);
+#endif
}
} /* namespace zeromq */
diff --git a/gr-zeromq/lib/pub_msg_sink_impl.h b/gr-zeromq/lib/pub_msg_sink_impl.h
index cfd81ca39..b40a88cc8 100644
--- a/gr-zeromq/lib/pub_msg_sink_impl.h
+++ b/gr-zeromq/lib/pub_msg_sink_impl.h
@@ -23,8 +23,8 @@
#ifndef INCLUDED_ZEROMQ_PUB_MSG_SINK_IMPL_H
#define INCLUDED_ZEROMQ_PUB_MSG_SINK_IMPL_H
+#include "zmq_common_impl.h"
#include <gnuradio/zeromq/pub_msg_sink.h>
-#include <zmq.hpp>
namespace gr {
namespace zeromq {
diff --git a/gr-zeromq/lib/pub_sink_impl.h b/gr-zeromq/lib/pub_sink_impl.h
index 6e921d906..624b071a8 100644
--- a/gr-zeromq/lib/pub_sink_impl.h
+++ b/gr-zeromq/lib/pub_sink_impl.h
@@ -24,7 +24,6 @@
#define INCLUDED_ZEROMQ_PUB_SINK_IMPL_H
#include <gnuradio/zeromq/pub_sink.h>
-#include <zmq.hpp>
#include "base_impl.h"
@@ -43,7 +42,7 @@ public:
int work(int noutput_items,
gr_vector_const_void_star& input_items,
- gr_vector_void_star& output_items);
+ gr_vector_void_star& output_items) override;
std::string last_endpoint() override { return base_sink_impl::last_endpoint(); }
};
diff --git a/gr-zeromq/lib/pull_msg_source_impl.h b/gr-zeromq/lib/pull_msg_source_impl.h
index 293d98da7..7efd1a7b4 100644
--- a/gr-zeromq/lib/pull_msg_source_impl.h
+++ b/gr-zeromq/lib/pull_msg_source_impl.h
@@ -46,8 +46,8 @@ public:
pull_msg_source_impl(char* address, int timeout);
~pull_msg_source_impl();
- bool start();
- bool stop();
+ bool start() override;
+ bool stop() override;
std::string last_endpoint() override
{
diff --git a/gr-zeromq/lib/pull_source_impl.h b/gr-zeromq/lib/pull_source_impl.h
index a27b3f9c4..2b0fecc82 100644
--- a/gr-zeromq/lib/pull_source_impl.h
+++ b/gr-zeromq/lib/pull_source_impl.h
@@ -24,7 +24,6 @@
#define INCLUDED_ZEROMQ_PULL_SOURCE_IMPL_H
#include <gnuradio/zeromq/pull_source.h>
-#include <zmq.hpp>
#include "base_impl.h"
@@ -43,7 +42,7 @@ public:
int work(int noutput_items,
gr_vector_const_void_star& input_items,
- gr_vector_void_star& output_items);
+ gr_vector_void_star& output_items) override;
std::string last_endpoint() override { return base_source_impl::last_endpoint(); }
};
diff --git a/gr-zeromq/lib/push_msg_sink_impl.cc b/gr-zeromq/lib/push_msg_sink_impl.cc
index 5239a22e7..c2c6e3bf4 100644
--- a/gr-zeromq/lib/push_msg_sink_impl.cc
+++ b/gr-zeromq/lib/push_msg_sink_impl.cc
@@ -75,7 +75,11 @@ void push_msg_sink_impl::handler(pmt::pmt_t msg)
zmq::message_t zmsg(s.size());
memcpy(zmsg.data(), s.c_str(), s.size());
+#if USE_NEW_CPPZMQ_SEND_RECV
+ d_socket->send(zmsg, zmq::send_flags::none);
+#else
d_socket->send(zmsg);
+#endif
}
} /* namespace zeromq */
diff --git a/gr-zeromq/lib/push_msg_sink_impl.h b/gr-zeromq/lib/push_msg_sink_impl.h
index 4d3017f78..ab453fc98 100644
--- a/gr-zeromq/lib/push_msg_sink_impl.h
+++ b/gr-zeromq/lib/push_msg_sink_impl.h
@@ -23,8 +23,8 @@
#ifndef INCLUDED_ZEROMQ_PUSH_MSG_SINK_IMPL_H
#define INCLUDED_ZEROMQ_PUSH_MSG_SINK_IMPL_H
+#include "zmq_common_impl.h"
#include <gnuradio/zeromq/push_msg_sink.h>
-#include <zmq.hpp>
namespace gr {
namespace zeromq {
diff --git a/gr-zeromq/lib/push_sink_impl.h b/gr-zeromq/lib/push_sink_impl.h
index bfa3dacdc..b66ff06fd 100644
--- a/gr-zeromq/lib/push_sink_impl.h
+++ b/gr-zeromq/lib/push_sink_impl.h
@@ -24,7 +24,6 @@
#define INCLUDED_ZEROMQ_PUSH_SINK_IMPL_H
#include <gnuradio/zeromq/push_sink.h>
-#include <zmq.hpp>
#include "base_impl.h"
@@ -43,7 +42,7 @@ public:
int work(int noutput_items,
gr_vector_const_void_star& input_items,
- gr_vector_void_star& output_items);
+ gr_vector_void_star& output_items) override;
std::string last_endpoint() override { return base_sink_impl::last_endpoint(); }
};
diff --git a/gr-zeromq/lib/rep_msg_sink_impl.cc b/gr-zeromq/lib/rep_msg_sink_impl.cc
index e1ac19e80..c2e187ff2 100644
--- a/gr-zeromq/lib/rep_msg_sink_impl.cc
+++ b/gr-zeromq/lib/rep_msg_sink_impl.cc
@@ -117,7 +117,11 @@ void rep_msg_sink_impl::readloop()
std::string s = sb.str();
zmq::message_t zmsg(s.size());
memcpy(zmsg.data(), s.c_str(), s.size());
+#if USE_NEW_CPPZMQ_SEND_RECV
+ d_socket->send(zmsg, zmq::send_flags::none);
+#else
d_socket->send(zmsg);
+#endif
} // if req
} // while !empty
diff --git a/gr-zeromq/lib/rep_msg_sink_impl.h b/gr-zeromq/lib/rep_msg_sink_impl.h
index 3042c4293..752acf0a6 100644
--- a/gr-zeromq/lib/rep_msg_sink_impl.h
+++ b/gr-zeromq/lib/rep_msg_sink_impl.h
@@ -46,8 +46,8 @@ public:
rep_msg_sink_impl(char* address, int timeout);
~rep_msg_sink_impl();
- bool start();
- bool stop();
+ bool start() override;
+ bool stop() override;
std::string last_endpoint() override
{
diff --git a/gr-zeromq/lib/rep_sink_impl.h b/gr-zeromq/lib/rep_sink_impl.h
index 3cca61db0..208caca28 100644
--- a/gr-zeromq/lib/rep_sink_impl.h
+++ b/gr-zeromq/lib/rep_sink_impl.h
@@ -41,7 +41,7 @@ public:
int work(int noutput_items,
gr_vector_const_void_star& input_items,
- gr_vector_void_star& output_items);
+ gr_vector_void_star& output_items) override;
std::string last_endpoint() override { return base_sink_impl::last_endpoint(); }
};
diff --git a/gr-zeromq/lib/req_msg_source_impl.h b/gr-zeromq/lib/req_msg_source_impl.h
index 828796037..ed4d307f2 100644
--- a/gr-zeromq/lib/req_msg_source_impl.h
+++ b/gr-zeromq/lib/req_msg_source_impl.h
@@ -46,8 +46,8 @@ public:
req_msg_source_impl(char* address, int timeout);
~req_msg_source_impl();
- bool start();
- bool stop();
+ bool start() override;
+ bool stop() override;
std::string last_endpoint() override
{
diff --git a/gr-zeromq/lib/req_source_impl.cc b/gr-zeromq/lib/req_source_impl.cc
index c7e87b742..f9f06362c 100644
--- a/gr-zeromq/lib/req_source_impl.cc
+++ b/gr-zeromq/lib/req_source_impl.cc
@@ -77,7 +77,11 @@ int req_source_impl::work(int noutput_items,
uint32_t req_len = noutput_items - done;
zmq::message_t request(sizeof(uint32_t));
memcpy((void*)request.data(), &req_len, sizeof(uint32_t));
+#if USE_NEW_CPPZMQ_SEND_RECV
+ d_socket->send(request, zmq::send_flags::none);
+#else
d_socket->send(request);
+#endif
d_req_pending = true;
}
diff --git a/gr-zeromq/lib/req_source_impl.h b/gr-zeromq/lib/req_source_impl.h
index 6e2d71f56..eb95499b1 100644
--- a/gr-zeromq/lib/req_source_impl.h
+++ b/gr-zeromq/lib/req_source_impl.h
@@ -24,7 +24,6 @@
#define INCLUDED_ZEROMQ_REQ_SOURCE_IMPL_H
#include <gnuradio/zeromq/req_source.h>
-#include <zmq.hpp>
#include "base_impl.h"
@@ -43,7 +42,7 @@ public:
int work(int noutput_items,
gr_vector_const_void_star& input_items,
- gr_vector_void_star& output_items);
+ gr_vector_void_star& output_items) override;
std::string last_endpoint() override { return base_source_impl::last_endpoint(); }
diff --git a/gr-zeromq/lib/sub_msg_source_impl.h b/gr-zeromq/lib/sub_msg_source_impl.h
index 8d760c0ad..8228a0b45 100644
--- a/gr-zeromq/lib/sub_msg_source_impl.h
+++ b/gr-zeromq/lib/sub_msg_source_impl.h
@@ -46,8 +46,8 @@ public:
sub_msg_source_impl(char* address, int timeout);
~sub_msg_source_impl();
- bool start();
- bool stop();
+ bool start() override;
+ bool stop() override;
std::string last_endpoint() override
{
diff --git a/gr-zeromq/lib/sub_source_impl.h b/gr-zeromq/lib/sub_source_impl.h
index 890907b80..94eaac68f 100644
--- a/gr-zeromq/lib/sub_source_impl.h
+++ b/gr-zeromq/lib/sub_source_impl.h
@@ -24,7 +24,6 @@
#define INCLUDED_ZEROMQ_SUB_SOURCE_IMPL_H
#include <gnuradio/zeromq/sub_source.h>
-#include <zmq.hpp>
#include "base_impl.h"
@@ -43,7 +42,7 @@ public:
int work(int noutput_items,
gr_vector_const_void_star& input_items,
- gr_vector_void_star& output_items);
+ gr_vector_void_star& output_items) override;
std::string last_endpoint() override { return base_source_impl::last_endpoint(); }
};
diff --git a/gr-zeromq/lib/tag_headers.cc b/gr-zeromq/lib/tag_headers.cc
index 34d2dd701..2d8971919 100644
--- a/gr-zeromq/lib/tag_headers.cc
+++ b/gr-zeromq/lib/tag_headers.cc
@@ -20,9 +20,9 @@
* Boston, MA 02110-1301, USA.
*/
+#include "zmq_common_impl.h"
#include <gnuradio/block.h>
#include <gnuradio/io_signature.h>
-#include <zmq.hpp>
#include <cstring>
#include <sstream>
diff --git a/gr-zeromq/lib/tag_headers.h b/gr-zeromq/lib/tag_headers.h
index b946f009a..c449f9cec 100644
--- a/gr-zeromq/lib/tag_headers.h
+++ b/gr-zeromq/lib/tag_headers.h
@@ -23,9 +23,9 @@
#ifndef ZEROMQ_TAG_HEADERS_H
#define ZEROMQ_TAG_HEADERS_H
+#include "zmq_common_impl.h"
#include <gnuradio/block.h>
#include <gnuradio/io_signature.h>
-#include <zmq.hpp>
#include <cstring>
#include <sstream>
Copyright © 1996 – 2023 Jason A. Donenfeld. All Rights Reverse Engineered.