sf-daq/sf_daq_buffer
0
0
Fork 0
mirror of https://github.com/paulscherrerinstitute/sf_daq_buffer.git synced 2026-04-28 00:22:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Moved File metadata from RingBuffer to buffer utils

Browse Source
This commit is contained in:
babic_a
2020-04-22 15:18:19 +02:00
parent d5fb4f4dc0
commit 4116ea04cf
2 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core-buffer/include/BufferUtils.hpp
+19
View File
@@ -6,10 +6,29 @@
namespace BufferUtils
{
const size_t STREAM_BLOCK_SIZE = 100;
extern const size_t FILE_MOD;
extern const size_t FOLDER_MOD;
extern const std::string FILE_EXTENSION;
#pragma pack(push)
#pragma pack(1)
struct FileBufferMetadata {
// Needed by RingBuffer
const uint64_t frame_bytes_size = 2*512*1024*STREAM_BLOCK_SIZE;
uint64_t buffer_slot_index;
uint64_t start_pulse_id;
uint64_t stop_pulse_id;
uint16_t module_id;
uint64_t pulse_id[STREAM_BLOCK_SIZE];
uint64_t frame_index[STREAM_BLOCK_SIZE];
uint32_t daq_rec[STREAM_BLOCK_SIZE];
uint16_t n_received_packets[STREAM_BLOCK_SIZE];
};
#pragma pack(pop)
std::string get_filename(
std::string root_folder,
std::string device_name,
core-writer/include/RingBuffer.hpp
-18
View File
@@ -12,24 +12,6 @@
#include <chrono>
#include "date.h"
#pragma pack(push)
#pragma pack(1)
struct FileBufferMetadata {
// Needed by RingBuffer
const uint64_t frame_bytes_size = 2*512*1024*50;
uint64_t buffer_slot_index;
uint64_t start_pulse_id;
uint64_t stop_pulse_id;
uint16_t module_id;
uint64_t pulse_id[50];
uint64_t frame_index[50];
uint32_t daq_rec[50];
uint16_t n_received_packets[50];
};
#pragma pack(pop)
struct FrameMetadata
{
// Ring buffer needed data.