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

Fix after rebase

Browse Source
This commit is contained in:
Dennis Klein
2018-11-01 22:07:01 +01:00
committed by Dennis Klein
parent b394feca18
commit 60f1f1000f
5 changed files with 74 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
fairmq/ofi/Message.cxx
View File

@@ -75,7 +75,9 @@ auto Message::Rebuild() -> void
if (fFreeFunction) {
fFreeFunction(fData, fHint);
} else {
fPmr->deallocate(fData, fSize);
if (fData) {
fPmr->deallocate(fData, fSize);
}
}
fData = nullptr;
fInitialSize = 0;
@@ -89,7 +91,9 @@ auto Message::Rebuild(const size_t size) -> void
if (fFreeFunction) {
fFreeFunction(fData, fHint);
} else {
fPmr->deallocate(fData, fSize);
if (fData) {
fPmr->deallocate(fData, fSize);
}
}
if (size) {
fData = fPmr->allocate(size);
@@ -108,7 +112,9 @@ auto Message::Rebuild(void* /*data*/, const size_t size, fairmq_free_fn* ffn, vo
if (fFreeFunction) {
fFreeFunction(fData, fHint);
} else {
fPmr->deallocate(fData, fSize);
if (fData) {
fPmr->deallocate(fData, fSize);
}
}
if (size) {
fData = fPmr->allocate(size);
@@ -152,9 +158,11 @@ auto Message::Copy(const fair::mq::Message& /*msg*/) -> void
Message::~Message()
{
if (fFreeFunction) {
fFreeFunction(fData, fHint);
fFreeFunction(fData, fHint);
} else {
fPmr->deallocate(fData, fSize);
if (fData) {
fPmr->deallocate(fData, fSize);
}
}
}