From 08ba0687911e3723e0d4b789964f2ed0f38c24f7 Mon Sep 17 00:00:00 2001 From: Alexey Rybalchenko Date: Tue, 7 Dec 2021 12:46:42 +0100 Subject: [PATCH] shm: remove unused member --- fairmq/shmem/Manager.h | 4 +--- fairmq/shmem/TransportFactory.h | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/fairmq/shmem/Manager.h b/fairmq/shmem/Manager.h index 549bc37f..a921201d 100644 --- a/fairmq/shmem/Manager.h +++ b/fairmq/shmem/Manager.h @@ -128,11 +128,10 @@ struct ShmHeader class Manager { public: - Manager(const std::string& sessionName, std::string deviceId, size_t size, const ProgOptions* config) + Manager(const std::string& sessionName, size_t size, const ProgOptions* config) : fShmId64(makeShmIdUint64(sessionName)) , fShmId(makeShmIdStr(sessionName)) , fSegmentId(config ? config->GetProperty("shm-segment-id", 0) : 0) - , fDeviceId(std::move(deviceId)) , fManagementSegment(boost::interprocess::open_or_create, std::string("fmq_" + fShmId + "_mng").c_str(), 6553600) , fShmVoidAlloc(fManagementSegment.get_segment_manager()) , fShmMtx(fManagementSegment.find_or_construct(boost::interprocess::unique_instance)()) @@ -818,7 +817,6 @@ class Manager uint64_t fShmId64; std::string fShmId; uint16_t fSegmentId; - std::string fDeviceId; std::unordered_map> fSegments; boost::interprocess::managed_shared_memory fManagementSegment; VoidAlloc fShmVoidAlloc; diff --git a/fairmq/shmem/TransportFactory.h b/fairmq/shmem/TransportFactory.h index beb89201..dbabf6c3 100644 --- a/fairmq/shmem/TransportFactory.h +++ b/fairmq/shmem/TransportFactory.h @@ -78,7 +78,7 @@ class TransportFactory final : public fair::mq::TransportFactory LOG(error) << "failed configuring context, reason: " << zmq_strerror(errno); } - fManager = std::make_unique(sessionName, deviceId, segmentSize, config); + fManager = std::make_unique(sessionName, segmentSize, config); } catch (boost::interprocess::interprocess_exception& e) { LOG(error) << "Could not initialize shared memory transport: " << e.what(); throw std::runtime_error(tools::ToString("Could not initialize shared memory transport: ", e.what()));