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

FairMQ: Fix missing region acks if receiver doesn't call OnData & clean includes.

Browse Source
This commit is contained in:
Alexey Rybalchenko
2017-11-29 16:55:51 +01:00
committed by Mohammad Al-Turany
parent 5c0178e882
commit fd19480a2e
15 changed files with 61 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
fairmq/shmem/Manager.cxx
View File

@@ -6,8 +6,8 @@
* copied verbatim in the file "LICENSE" *
********************************************************************************/
#include "Manager.h"
#include "Common.h"
#include <fairmq/shmem/Manager.h>
#include <fairmq/shmem/Common.h>
namespace fair
{
@@ -71,20 +71,20 @@ bipc::mapped_region* Manager::CreateRegion(const size_t size, const uint64_t id,
}
}
bipc::mapped_region* Manager::GetRemoteRegion(const uint64_t id)
Region* Manager::GetRemoteRegion(const uint64_t id)
{
// remote region could actually be a local one if a message originates from this device (has been sent out and returned)
auto it = fRegions.find(id);
if (it != fRegions.end())
{
return &(it->second.fRegion);
return &(it->second);
}
else
{
try
{
auto r = fRegions.emplace(id, Region{*this, id, 0, true, nullptr});
return &(r.first->second.fRegion);
return &(r.first->second);
}
catch (bipc::interprocess_exception& e)
{
@@ -100,18 +100,6 @@ void Manager::RemoveRegion(const uint64_t id)
fRegions.erase(id);
}
bipc::message_queue* Manager::GetRegionQueue(const uint64_t id)
{
try
{
return fRegions.at(id).fQueue.get();
}
catch (out_of_range& oor)
{
return nullptr;
}
}
void Manager::RemoveSegment()
{
if (bipc::shared_memory_object::remove(fSegmentName.c_str()))