From 762b58e14c4cccbd2ccd099ba9621fbcb691a32e Mon Sep 17 00:00:00 2001 From: Filip Leonarski Date: Fri, 7 Apr 2023 18:42:35 +0200 Subject: [PATCH] MlxRawEthDevice: Change constructor signature --- receiver/host/MlxRawEthDevice.cpp | 15 ++++----------- receiver/host/MlxRawEthDevice.h | 3 --- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/receiver/host/MlxRawEthDevice.cpp b/receiver/host/MlxRawEthDevice.cpp index 668838b3..db229390 100644 --- a/receiver/host/MlxRawEthDevice.cpp +++ b/receiver/host/MlxRawEthDevice.cpp @@ -4,21 +4,14 @@ #ifdef JFJOCH_USE_IBVERBS #include "MlxRawEthDevice.h" -MlxRawEthDevice::MlxRawEthDevice(const std::string &device_name, - uint16_t data_stream, - size_t in_frame_buffer_size_modules, +MlxRawEthDevice::MlxRawEthDevice(uint16_t dev_id, uint16_t data_stream, size_t in_frame_buffer_size_modules, int16_t in_numa_node) : AcquisitionDevice(data_stream), - context(device_name), - numa_node(in_numa_node) { + context("mlx5_" + std::to_string(dev_id)), + numa_node(in_numa_node) +{ max_modules = 16; MapBuffersStandard(in_frame_buffer_size_modules, 1, numa_node); -} - -MlxRawEthDevice::MlxRawEthDevice(uint16_t dev_id, uint16_t data_stream, size_t in_frame_buffer_size_modules, - int16_t numa_node) - : MlxRawEthDevice("mlx5_" + std::to_string(dev_id), data_stream, in_frame_buffer_size_modules, numa_node) -{ mac_addr = (static_cast(dev_id) << 8*5) | 0x00DDCCBBAA06; } diff --git a/receiver/host/MlxRawEthDevice.h b/receiver/host/MlxRawEthDevice.h index ec47642f..16db6137 100644 --- a/receiver/host/MlxRawEthDevice.h +++ b/receiver/host/MlxRawEthDevice.h @@ -35,9 +35,6 @@ class MlxRawEthDevice : public AcquisitionDevice { public: MlxRawEthDevice(uint16_t dev_id, uint16_t data_stream, size_t in_frame_buffer_size_modules, int16_t numa_node = -1); - - MlxRawEthDevice(const std::string &device_name, uint16_t data_stream, size_t in_frame_buffer_size_modules, - int16_t numa_node = -1); ~MlxRawEthDevice() override = default; void InitializeCalibration(const DiffractionExperiment &experiment, const JFCalibration &calib) override; int32_t GetNUMANode() const override;