From 3e097a5cd867ce9340c72a39f35f6205cd3a55bf Mon Sep 17 00:00:00 2001 From: Andrej Babic Date: Mon, 21 Sep 2020 09:56:06 +0200 Subject: [PATCH] Adjust stream sender to use reference --- sf-stream/include/ZmqLiveSender.hpp | 2 +- sf-stream/src/ZmqLiveSender.cpp | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sf-stream/include/ZmqLiveSender.hpp b/sf-stream/include/ZmqLiveSender.hpp index 5e38aba..96e5424 100644 --- a/sf-stream/include/ZmqLiveSender.hpp +++ b/sf-stream/include/ZmqLiveSender.hpp @@ -38,7 +38,7 @@ public: const LiveStreamConfig& config); ~ZmqLiveSender(); - void send(const ImageMetadata* meta, const char* data); + void send(const ImageMetadata& meta, const char* data); }; diff --git a/sf-stream/src/ZmqLiveSender.cpp b/sf-stream/src/ZmqLiveSender.cpp index 6e7b52c..d71485e 100644 --- a/sf-stream/src/ZmqLiveSender.cpp +++ b/sf-stream/src/ZmqLiveSender.cpp @@ -88,7 +88,7 @@ ZmqLiveSender::~ZmqLiveSender() zmq_close(socket_live_); } -void ZmqLiveSender::send(const ImageMetadata *meta, const char *data) +void ZmqLiveSender::send(const ImageMetadata& meta, const char *data) { uint16_t data_empty [] = { 0, 0, 0, 0}; @@ -96,15 +96,15 @@ void ZmqLiveSender::send(const ImageMetadata *meta, const char *data) auto& header_alloc = header.GetAllocator(); string text_header; - if(zmq_send(socket_pulse_, &meta->pulse_id, sizeof(uint64_t), 0) == -1) { + if(zmq_send(socket_pulse_, &meta.pulse_id, sizeof(uint64_t), 0) == -1) { throw runtime_error(zmq_strerror(errno)); } // TODO: Here we need to send to streamvis and live analysis metadata(probably need to operate still on them) and data(not every frame) - header.AddMember("frame", meta->frame_index, header_alloc); - header.AddMember("is_good_frame", meta->is_good_image, header_alloc); - header.AddMember("daq_rec", meta->daq_rec, header_alloc); - header.AddMember("pulse_id", meta->pulse_id, header_alloc); + header.AddMember("frame", meta.frame_index, header_alloc); + header.AddMember("is_good_frame", meta.is_good_image, header_alloc); + header.AddMember("daq_rec", meta.daq_rec, header_alloc); + header.AddMember("pulse_id", meta.pulse_id, header_alloc); rapidjson::Value pedestal_file; pedestal_file.SetString(config_.PEDE_FILENAME.c_str(), header_alloc); @@ -118,7 +118,7 @@ void ZmqLiveSender::send(const ImageMetadata *meta, const char *data) rapidjson::Value run_name; run_name.SetString( - to_string(uint64_t(meta->pulse_id/10000)*10000).c_str(), + to_string(uint64_t(meta.pulse_id/10000)*10000).c_str(), header_alloc); header.AddMember("run_name", run_name, header_alloc);