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

Use class variables instead of function parameters

Browse Source
This commit is contained in:
babic_a
2020-05-08 10:40:21 +02:00
parent ddde32a8c2
commit 7ed1166edd
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core-buffer/include/LiveRecvModule.hpp
+1 -1
View File
@@ -25,7 +25,7 @@ public:
virtual ~LiveRecvModule();
void* connect_socket(size_t module_id);
void recv_single_module(void* socket, ModuleFrame* metadata, char* data);
void receive_thread(const size_t n_modules);
void receive_thread();
uint64_t align_modules(
const std::vector<void*>& sockets,
ModuleFrameBuffer *metadata,
core-buffer/src/LiveRecvModule.cpp
+7 -8
View File
@@ -27,8 +27,7 @@ LiveRecvModule::LiveRecvModule(
cout << endl;
#endif
receiving_thread_ = thread(
&LiveRecvModule::receive_thread, this, n_modules);
receiving_thread_ = thread(&LiveRecvModule::receive_thread, this);
}
LiveRecvModule::~LiveRecvModule()
@@ -132,13 +131,13 @@ uint64_t LiveRecvModule::align_modules(
return max_pulse_id;
}
void LiveRecvModule::receive_thread(const size_t n_modules)
void LiveRecvModule::receive_thread()
{
try {
vector<void*> sockets(n_modules);
vector<void*> sockets(n_modules_);
for (size_t i = 0; i < n_modules; i++) {
for (size_t i = 0; i < n_modules_; i++) {
sockets[i] = connect_socket(i);
}
@@ -149,7 +148,7 @@ void LiveRecvModule::receive_thread(const size_t n_modules)
auto data = queue_.get_data_buffer(slot_id);
// First buffer load for alignment.
for (size_t i_module = 0; i_module < n_modules; i_module++) {
for (size_t i_module = 0; i_module < n_modules_; i_module++) {
auto& module_metadata = metadata->module[i_module];
recv_single_module(
@@ -175,7 +174,7 @@ void LiveRecvModule::receive_thread(const size_t n_modules)
data = queue_.get_data_buffer(slot_id);
bool sync_needed = false;
for (size_t i_module = 0; i_module < n_modules; i_module++) {
for (size_t i_module = 0; i_module < n_modules_; i_module++) {
auto& module_metadata = metadata->module[i_module];
recv_single_module(
@@ -208,7 +207,7 @@ void LiveRecvModule::receive_thread(const size_t n_modules)
current_pulse_id++;
}
for (size_t i = 0; i < n_modules; i++) {
for (size_t i = 0; i < n_modules_; i++) {
zmq_close(sockets[i]);
}