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

Changed recv function signature with complete pointer type

Browse Source
This commit is contained in:
babic_a
2020-05-06 12:47:59 +02:00
parent 90e6b06208
commit af9027fe66
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core-buffer/include/LiveRecvModule.hpp
+1 -1
View File
@@ -23,7 +23,7 @@ public:
virtual ~LiveRecvModule();
void* connect_socket(size_t module_id);
void recv_single_module(void* socket, char* metadata, char* data);
void recv_single_module(void* socket, ModuleFrame* metadata, char* data);
void receive_thread(const size_t n_modules, void* ctx);
};
core-buffer/src/LiveRecvModule.cpp
+9 -7
View File
@@ -73,7 +73,7 @@ void* LiveRecvModule::connect_socket(size_t module_id)
}
void LiveRecvModule::recv_single_module(
void* socket, char* metadata, char* data)
void* socket, ModuleFrame* metadata, char* data)
{
auto n_bytes_metadata = zmq_recv(
socket,
@@ -85,6 +85,10 @@ void LiveRecvModule::recv_single_module(
throw runtime_error("Stream header of wrong size.");
}
if (metadata->pulse_id == 0) {
throw runtime_error("Received invalid pulse_id=0.");
}
auto n_bytes_image = zmq_recv(
socket,
data,
@@ -117,12 +121,10 @@ void LiveRecvModule::receive_thread(const size_t n_modules, void* ctx_)
recv_single_module(
sockets[i_module],
(char*)(&(module_metadata)),
&module_metadata,
data + (MODULE_N_BYTES * i_module));
current_pulse_id = max(
current_pulse_id,
metadata->module[i_module].pulse_id);
current_pulse_id = max(current_pulse_id, module_metadata.pulse_id);
}
// Second pass - align all receivers to the max pulse_id.
@@ -133,7 +135,7 @@ void LiveRecvModule::receive_thread(const size_t n_modules, void* ctx_)
for (size_t i = 0; i < diff_to_max; i++) {
recv_single_module(
sockets[i_module],
(char *) (&(module_metadata)),
&module_metadata,
data + (MODULE_N_BYTES * i_module));
}
@@ -161,7 +163,7 @@ void LiveRecvModule::receive_thread(const size_t n_modules, void* ctx_)
recv_single_module(
sockets[i_module],
(char*)(&(module_metadata)),
&module_metadata,
data + (MODULE_N_BYTES * i_module));
if (current_pulse_id != module_metadata.pulse_id) {