Mirror/FairMQ
1
0
Fork 0
mirror of https://github.com/FairRootGroup/FairMQ.git synced 2025-10-13 08:41:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

shm: remove alignment member from Message

Browse Source
This commit is contained in:
Alexey Rybalchenko 2023-10-18 21:09:01 +02:00
parent 3c714fd9e0
commit 5aa6c99442
1 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
fairmq/shmem/Message.h
View File

@ -46,14 +46,13 @@ class Message final : public fair::mq::Message
, fShared(-1) , fShared(-1)
, fRegionId(0) , fRegionId(0)
, fSegmentId(fManager.GetSegmentId()) , fSegmentId(fManager.GetSegmentId())
, fAlignment(0)
, fManaged(true) , fManaged(true)
, fQueued(false) , fQueued(false)
{ {
fManager.IncrementMsgCounter(); fManager.IncrementMsgCounter();
} }
Message(Manager& manager, Alignment alignment, fair::mq::TransportFactory* factory = nullptr) Message(Manager& manager, Alignment /* alignment */, fair::mq::TransportFactory* factory = nullptr)
: fair::mq::Message(factory) : fair::mq::Message(factory)
, fManager(manager) , fManager(manager)
, fRegionPtr(nullptr) , fRegionPtr(nullptr)
@ -64,7 +63,6 @@ class Message final : public fair::mq::Message
, fShared(-1) , fShared(-1)
, fRegionId(0) , fRegionId(0)
, fSegmentId(fManager.GetSegmentId()) , fSegmentId(fManager.GetSegmentId())
, fAlignment(alignment.alignment)
, fManaged(true) , fManaged(true)
, fQueued(false) , fQueued(false)
{ {
@ -82,7 +80,6 @@ class Message final : public fair::mq::Message
, fShared(-1) , fShared(-1)
, fRegionId(0) , fRegionId(0)
, fSegmentId(fManager.GetSegmentId()) , fSegmentId(fManager.GetSegmentId())
, fAlignment(0)
, fManaged(true) , fManaged(true)
, fQueued(false) , fQueued(false)
{ {
@ -101,11 +98,10 @@ class Message final : public fair::mq::Message
, fShared(-1) , fShared(-1)
, fRegionId(0) , fRegionId(0)
, fSegmentId(fManager.GetSegmentId()) , fSegmentId(fManager.GetSegmentId())
, fAlignment(alignment.alignment)
, fManaged(true) , fManaged(true)
, fQueued(false) , fQueued(false)
{ {
InitializeChunk(size, fAlignment); InitializeChunk(size, alignment.alignment);
fManager.IncrementMsgCounter(); fManager.IncrementMsgCounter();
} }
@ -120,7 +116,6 @@ class Message final : public fair::mq::Message
, fShared(-1) , fShared(-1)
, fRegionId(0) , fRegionId(0)
, fSegmentId(fManager.GetSegmentId()) , fSegmentId(fManager.GetSegmentId())
, fAlignment(0)
, fManaged(true) , fManaged(true)
, fQueued(false) , fQueued(false)
{ {
@ -146,7 +141,6 @@ class Message final : public fair::mq::Message
, fShared(-1) , fShared(-1)
, fRegionId(static_cast<UnmanagedRegionImpl*>(region.get())->fRegionId) , fRegionId(static_cast<UnmanagedRegionImpl*>(region.get())->fRegionId)
, fSegmentId(fManager.GetSegmentId()) , fSegmentId(fManager.GetSegmentId())
, fAlignment(0)
, fManaged(false) , fManaged(false)
, fQueued(false) , fQueued(false)
{ {
@ -176,7 +170,6 @@ class Message final : public fair::mq::Message
, fShared(hdr.fShared) , fShared(hdr.fShared)
, fRegionId(hdr.fRegionId) , fRegionId(hdr.fRegionId)
, fSegmentId(hdr.fSegmentId) , fSegmentId(hdr.fSegmentId)
, fAlignment(0)
, fManaged(hdr.fManaged) , fManaged(hdr.fManaged)
, fQueued(false) , fQueued(false)
{ {
@ -194,11 +187,10 @@ class Message final : public fair::mq::Message
fQueued = false; fQueued = false;
} }
void Rebuild(Alignment alignment) override void Rebuild(Alignment /* alignment */) override
{ {
CloseMessage(); CloseMessage();
fQueued = false; fQueued = false;
fAlignment = alignment.alignment;
} }
void Rebuild(size_t size) override void Rebuild(size_t size) override
@ -212,8 +204,7 @@ class Message final : public fair::mq::Message
{ {
CloseMessage(); CloseMessage();
fQueued = false; fQueued = false;
fAlignment = alignment.alignment; InitializeChunk(size, alignment.alignment);
InitializeChunk(size, fAlignment);
} }
void Rebuild(void* data, size_t size, fair::mq::FreeFn* ffn, void* hint = nullptr) override void Rebuild(void* data, size_t size, fair::mq::FreeFn* ffn, void* hint = nullptr) override
@ -377,7 +368,6 @@ class Message final : public fair::mq::Message
mutable boost::interprocess::managed_shared_memory::handle_t fShared; // handle to the buffer storing the ref count for shared buffers mutable boost::interprocess::managed_shared_memory::handle_t fShared; // handle to the buffer storing the ref count for shared buffers
uint16_t fRegionId; // id of the unmanaged region uint16_t fRegionId; // id of the unmanaged region
mutable uint16_t fSegmentId; // id of the managed segment mutable uint16_t fSegmentId; // id of the managed segment
size_t fAlignment;
bool fManaged; // true = managed segment, false = unmanaged region bool fManaged; // true = managed segment, false = unmanaged region
bool fQueued; bool fQueued;
@ -452,7 +442,6 @@ class Message final : public fair::mq::Message
{ {
try { try {
Deallocate(); Deallocate();
fAlignment = 0;
fManager.DecrementMsgCounter(); fManager.DecrementMsgCounter();
} catch (SharedMemoryError& sme) { } catch (SharedMemoryError& sme) {
LOG(error) << "error closing message: " << sme.what(); LOG(error) << "error closing message: " << sme.what();