mirror of
https://github.com/paulscherrerinstitute/sf_daq_buffer.git
synced 2026-05-02 00:42:22 +02:00
Writer receiver refactoring
This commit is contained in:
@@ -4,6 +4,7 @@
|
||||
#include <string>
|
||||
#include "WriterH5Writer.hpp"
|
||||
#include <vector>
|
||||
#include <jungfrau.hpp>
|
||||
|
||||
|
||||
class WriterZmqReceiver {
|
||||
@@ -11,7 +12,7 @@ class WriterZmqReceiver {
|
||||
const size_t n_modules_;
|
||||
std::vector<void*> sockets_;
|
||||
|
||||
StreamModuleFrame frame_metadata;
|
||||
ReplayModuleFrameBuffer frame_metadata;
|
||||
|
||||
public:
|
||||
WriterZmqReceiver(
|
||||
@@ -21,9 +22,9 @@ public:
|
||||
|
||||
virtual ~WriterZmqReceiver();
|
||||
|
||||
void get_next_image(
|
||||
void get_next_batch(
|
||||
const uint64_t pulse_id,
|
||||
ImageMetadata* image_metadata,
|
||||
ImageMetadataBuffer* image_metadata,
|
||||
char* image_buffer);
|
||||
};
|
||||
|
||||
|
||||
@@ -46,9 +46,9 @@ WriterZmqReceiver::~WriterZmqReceiver()
|
||||
}
|
||||
}
|
||||
|
||||
void WriterZmqReceiver::get_next_image(
|
||||
void WriterZmqReceiver::get_next_batch(
|
||||
const uint64_t pulse_id,
|
||||
ImageMetadata* image_metadata,
|
||||
ImageMetadataBuffer* image_metadata,
|
||||
char* image_buffer)
|
||||
{
|
||||
// Init the image metadata.
|
||||
@@ -66,13 +66,17 @@ void WriterZmqReceiver::get_next_image(
|
||||
auto n_bytes_metadata = zmq_recv(
|
||||
sockets_[i_module],
|
||||
&frame_metadata,
|
||||
sizeof(StreamModuleFrame),
|
||||
sizeof(ReplayModuleFrameBuffer),
|
||||
0);
|
||||
|
||||
if (n_bytes_metadata != sizeof(StreamModuleFrame)) {
|
||||
if (n_bytes_metadata != sizeof(ReplayModuleFrameBuffer)) {
|
||||
throw runtime_error("Wrong number of metadata bytes.");
|
||||
}
|
||||
|
||||
for (size_t i=0; i<REPLAY_READ_BUFFER_SIZE; i++) {
|
||||
|
||||
}
|
||||
|
||||
// sf_replay should always send the right pulse_id.
|
||||
if (frame_metadata.metadata.pulse_id != pulse_id) {
|
||||
stringstream err_msg;
|
||||
|
||||
Reference in New Issue
Block a user