From 7ed1166edd185f79a61e47cc53ee1c880df5c665 Mon Sep 17 00:00:00 2001 From: Andrej Babic Date: Fri, 8 May 2020 10:40:21 +0200 Subject: [PATCH] Use class variables instead of function parameters --- core-buffer/include/LiveRecvModule.hpp | 2 +- core-buffer/src/LiveRecvModule.cpp | 15 +++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/core-buffer/include/LiveRecvModule.hpp b/core-buffer/include/LiveRecvModule.hpp index d63357a..be0f8e5 100644 --- a/core-buffer/include/LiveRecvModule.hpp +++ b/core-buffer/include/LiveRecvModule.hpp @@ -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& sockets, ModuleFrameBuffer *metadata, diff --git a/core-buffer/src/LiveRecvModule.cpp b/core-buffer/src/LiveRecvModule.cpp index 691222c..cbaabec 100644 --- a/core-buffer/src/LiveRecvModule.cpp +++ b/core-buffer/src/LiveRecvModule.cpp @@ -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 sockets(n_modules); + vector 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]); }