From 7418cd361304a50b3311834644a4503ebe8f9d64 Mon Sep 17 00:00:00 2001
From: Andrej Babic <andrej.babic@psi.ch>
Date: Fri, 1 May 2020 13:09:09 +0200
Subject: [PATCH] Improve interface for caching data from file

---
 core-buffer/include/LiveH5Reader.hpp | 12 +++---------
 sf-buffer/src/sf_live.cpp            |  2 +-
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/core-buffer/include/LiveH5Reader.hpp b/core-buffer/include/LiveH5Reader.hpp
index 809fbde..d3c31c8 100644
--- a/core-buffer/include/LiveH5Reader.hpp
+++ b/core-buffer/include/LiveH5Reader.hpp
@@ -8,16 +8,10 @@
 
 class LiveH5Reader {
 
-    struct LiveBufferMetadata {
-        uint64_t pulse_id[core_buffer::FILE_MOD];
-        uint64_t frame_index[core_buffer::FILE_MOD];
-        uint32_t daq_rec[core_buffer::FILE_MOD];
-        uint16_t n_received_packets[core_buffer::FILE_MOD];
-    };
-
     const std::string current_filename_;
     const uint16_t source_id_;
-    std::unique_ptr<LiveBufferMetadata> metadata_buffer_;
+
+    std::unique_ptr<uint64_t[]> pulse_id_buffer_;
     std::unique_ptr<uint16_t[]> data_buffer_;
 
 public:
@@ -29,7 +23,7 @@ public:
     uint64_t get_latest_pulse_id();
     void load_pulse_id(uint64_t pulse_id);
 
-    ModuleFrame* get_metadata();
+    ModuleFrame get_metadata();
     char* get_data();
 };
 
diff --git a/sf-buffer/src/sf_live.cpp b/sf-buffer/src/sf_live.cpp
index 2f69bff..2f0b6c1 100644
--- a/sf-buffer/src/sf_live.cpp
+++ b/sf-buffer/src/sf_live.cpp
@@ -25,7 +25,7 @@ void sf_live (
         auto metadata = reader.get_metadata();
 
         zmq_send(socket,
-                 (char*) metadata,
+                 &metadata,
                  sizeof(ModuleFrame),
                  ZMQ_SNDMORE);