From 0f6d63aded37ccde4539ac480034f35c1a4eaebb Mon Sep 17 00:00:00 2001 From: Andrej Babic Date: Wed, 27 May 2020 10:22:44 +0200 Subject: [PATCH] Send BufferBinaryBlock from sf_replay --- sf-replay/include/ReplayZmqSender.hpp | 2 +- sf-replay/src/ReplayZmqSender.cpp | 6 ++++-- sf-replay/src/main.cpp | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/sf-replay/include/ReplayZmqSender.hpp b/sf-replay/include/ReplayZmqSender.hpp index 845c9f0..7396b1e 100644 --- a/sf-replay/include/ReplayZmqSender.hpp +++ b/sf-replay/include/ReplayZmqSender.hpp @@ -16,7 +16,7 @@ public: void close(); - void send(const ReplayBuffer* metadata, const char* data); + void send(const BufferBinaryBlock* metadata, const char* data); }; diff --git a/sf-replay/src/ReplayZmqSender.cpp b/sf-replay/src/ReplayZmqSender.cpp index 71b357d..27be144 100644 --- a/sf-replay/src/ReplayZmqSender.cpp +++ b/sf-replay/src/ReplayZmqSender.cpp @@ -41,8 +41,10 @@ void ReplayZmqSender::close() { zmq_ctx_destroy(ctx_); } -void ReplayZmqSender::send(const ReplayBuffer* metadata, const char* data) +void ReplayZmqSender::send( + const BufferBinaryBlock* metadata, + const char* data) { - zmq_send(socket_, metadata, sizeof(ReplayBuffer), ZMQ_SNDMORE); + zmq_send(socket_, metadata, sizeof(BufferBinaryBlock), ZMQ_SNDMORE); zmq_send(socket_, data, MODULE_N_BYTES * BUFFER_BLOCK_SIZE, 0); } \ No newline at end of file diff --git a/sf-replay/src/main.cpp b/sf-replay/src/main.cpp index e97e04a..81d9937 100644 --- a/sf-replay/src/main.cpp +++ b/sf-replay/src/main.cpp @@ -14,7 +14,7 @@ using namespace chrono; void sf_replay ( const string device, const string channel_name, - FastQueue& queue, + FastQueue& queue, const uint64_t start_pulse_id, const uint64_t stop_pulse_id ) @@ -75,7 +75,7 @@ int main (int argc, char *argv[]) { const auto start_pulse_id = (uint64_t) atoll(argv[5]); const auto stop_pulse_id = (uint64_t) atoll(argv[6]); - FastQueue queue( + FastQueue queue( MODULE_N_BYTES * BUFFER_BLOCK_SIZE, REPLAY_FASTQUEUE_N_SLOTS);