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

Rename size attribute of StreamModuleFrame

Browse Source
This commit is contained in:
babic_a
2020-05-19 12:28:29 +02:00
parent 3b08ceed4b
commit 03e2e6fda4
4 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core-buffer/include/jungfrau.hpp
+1 -1
View File
@@ -52,7 +52,7 @@ struct ModuleFrame {
#pragma pack(1)
struct StreamModuleFrame {
ModuleFrame metadata;
uint64_t frame_size;
uint64_t data_n_bytes;
bool is_frame_present;
};
#pragma pack(pop)
core-buffer/src/WriterZmqReceiver.cpp
+2 -2
View File
@@ -131,10 +131,10 @@ void WriterZmqReceiver::get_next_image(
auto n_bytes_image = zmq_recv(
sockets_[i_module],
(image_buffer + image_buffer_offset),
frame_metadata.frame_size,
frame_metadata.data_n_bytes,
0);
if (n_bytes_image != frame_metadata.frame_size) {
if (n_bytes_image != frame_metadata.data_n_bytes) {
throw runtime_error("Wrong number of data bytes.");
}
core-buffer/test/test_WriterZmqReceiver.cpp
+1 -1
View File
@@ -51,7 +51,7 @@ TEST(WriterZmqReceiver, basic_test)
frame_metadata.metadata.daq_rec = 4;
frame_metadata.is_frame_present = 1;
frame_metadata.frame_size = compressed_frame_size;
frame_metadata.data_n_bytes = compressed_frame_size;
zmq_send(sockets[i],
&frame_metadata,