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: shared memory unmanaged region updates:

Browse Source 
- use same mapping for sender/receiver (created/remote) region.
 - rename FairMQRegion -> FairMQUnmanagedRegion.
This commit is contained in:
Alexey Rybalchenko
2017-10-19 11:17:05 +02:00
committed by Mohammad Al-Turany
parent f7d3a5e8ae
commit 0bb866ff36
24 changed files with 212 additions and 327 deletions
Download Patch File Download Diff File Expand all files Collapse all files

148
fairmq/shmem/FairMQMessageSHM.cxx
View File

@@ -1,15 +1,15 @@
/********************************************************************************
* Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH *
* *
* This software is distributed under the terms of the *
* GNU Lesser General Public Licence version 3 (LGPL) version 3, *
* This software is distributed under the terms of the *
* GNU Lesser General Public Licence version 3 (LGPL) version 3, *
* copied verbatim in the file "LICENSE" *
********************************************************************************/
#include <string>
#include <cstdlib>
#include "FairMQMessageSHM.h"
#include "FairMQRegionSHM.h"
#include "FairMQUnmanagedRegionSHM.h"
#include "FairMQLogger.h"
#include "FairMQShmCommon.h"
@@ -18,15 +18,11 @@ using namespace fair::mq::shmem;
namespace bipc = boost::interprocess;
// uint64_t FairMQMessageSHM::fMessageID = 0;
// string FairMQMessageSHM::fDeviceID = string();
atomic<bool> FairMQMessageSHM::fInterrupted(false);
FairMQ::Transport FairMQMessageSHM::fTransportType = FairMQ::Transport::SHM;
FairMQMessageSHM::FairMQMessageSHM()
: fMessage()
// , fOwner(nullptr)
// , fReceiving(false)
, fQueued(false)
, fMetaCreated(false)
, fRegionId(0)
@@ -42,15 +38,8 @@ FairMQMessageSHM::FairMQMessageSHM()
fMetaCreated = true;
}
// void FairMQMessageSHM::StringDeleter(void* /*data*/, void* str)
// {
// delete static_cast<string*>(str);
// }
FairMQMessageSHM::FairMQMessageSHM(const size_t size)
: fMessage()
// , fOwner(nullptr)
// , fReceiving(false)
, fQueued(false)
, fMetaCreated(false)
, fRegionId(0)
@@ -64,8 +53,6 @@ FairMQMessageSHM::FairMQMessageSHM(const size_t size)
FairMQMessageSHM::FairMQMessageSHM(void* data, const size_t size, fairmq_free_fn* ffn, void* hint)
: fMessage()
// , fOwner(nullptr)
// , fReceiving(false)
, fQueued(false)
, fMetaCreated(false)
, fRegionId(0)
@@ -88,13 +75,11 @@ FairMQMessageSHM::FairMQMessageSHM(void* data, const size_t size, fairmq_free_fn
}
}
FairMQMessageSHM::FairMQMessageSHM(FairMQRegionPtr& region, void* data, const size_t size)
FairMQMessageSHM::FairMQMessageSHM(FairMQUnmanagedRegionPtr& region, void* data, const size_t size)
: fMessage()
// , fOwner(nullptr)
// , fReceiving(false)
, fQueued(false)
, fMetaCreated(false)
, fRegionId(static_cast<FairMQRegionSHM*>(region.get())->fRegionId)
, fRegionId(static_cast<FairMQUnmanagedRegionSHM*>(region.get())->fRegionId)
, fHandle()
, fSize(size)
, fLocalPtr(data)
@@ -113,11 +98,6 @@ FairMQMessageSHM::FairMQMessageSHM(FairMQRegionPtr& region, void* data, const si
header.fHandle = fHandle;
header.fRegionId = fRegionId;
memcpy(zmq_msg_data(&fMessage), &header, sizeof(MetaHeader));
// placement new fails in some environments, TODO: investigate why:
// MetaHeader* metaPtr = new(zmq_msg_data(&fMessage)) MetaHeader();
// metaPtr->fSize = size;
// metaPtr->fHandle = fHandle;
// metaPtr->fRegionId = fRegionId;
fMetaCreated = true;
}
@@ -125,18 +105,11 @@ FairMQMessageSHM::FairMQMessageSHM(FairMQRegionPtr& region, void* data, const si
bool FairMQMessageSHM::InitializeChunk(const size_t size)
{
// string chunkID = fDeviceID + "c" + to_string(fMessageID);
// string* ownerID = new string(fDeviceID + "o" + to_string(fMessageID));
while (!fHandle)
{
try
{
fLocalPtr = Manager::Instance().Segment()->allocate(size);
// fOwner = Manager::Instance().Segment()->construct<ShPtrOwner>(ownerID->c_str())(
// make_managed_shared_ptr(Manager::Instance().Segment()->construct<Chunk>(chunkID.c_str())(size),
// *(Manager::Instance().Segment())));
}
catch (bipc::bad_alloc& ba)
{
@@ -166,19 +139,9 @@ bool FairMQMessageSHM::InitializeChunk(const size_t size)
header.fHandle = fHandle;
header.fRegionId = fRegionId;
memcpy(zmq_msg_data(&fMessage), &header, sizeof(MetaHeader));
// MetaHeader* metaPtr = new(zmq_msg_data(&fMessage)) MetaHeader();
// metaPtr->fSize = size;
// metaPtr->fHandle = fHandle;
// metaPtr->fRegionId = fRegionId;
// if (zmq_msg_init_data(&fMessage, const_cast<char*>(ownerID->c_str()), ownerID->length(), StringDeleter, ownerID) != 0)
// {
// LOG(ERROR) << "failed initializing meta message, reason: " << zmq_strerror(errno);
// }
fMetaCreated = true;
// ++fMessageID;
return true;
}
@@ -186,7 +149,6 @@ void FairMQMessageSHM::Rebuild()
{
CloseMessage();
// fReceiving = false;
fQueued = false;
if (zmq_msg_init(&fMessage) != 0)
@@ -200,7 +162,6 @@ void FairMQMessageSHM::Rebuild(const size_t size)
{
CloseMessage();
// fReceiving = false;
fQueued = false;
InitializeChunk(size);
@@ -210,7 +171,6 @@ void FairMQMessageSHM::Rebuild(void* data, const size_t size, fairmq_free_fn* ff
{
CloseMessage();
// fReceiving = false;
fQueued = false;
if (InitializeChunk(size))
@@ -248,35 +208,17 @@ void* FairMQMessageSHM::GetData()
{
if (!fRemoteRegion)
{
fRemoteRegion = FairMQRegionPtr(new FairMQRegionSHM(fRegionId, true));
fRemoteRegion = FairMQUnmanagedRegionSHM::GetRemoteRegion(fRegionId);
}
fLocalPtr = reinterpret_cast<char*>(fRemoteRegion->GetData()) + fHandle;
fLocalPtr = reinterpret_cast<char*>(fRemoteRegion->get_address()) + fHandle;
return fLocalPtr;
}
}
// if (fOwner)
// {
// return fOwner->fPtr->GetData();
// }
// else
// {
// LOG(ERROR) << "Trying to get data of an empty shared memory message";
// exit(EXIT_FAILURE);
// }
}
size_t FairMQMessageSHM::GetSize()
{
return fSize;
// if (fOwner)
// {
// return fOwner->fPtr->GetSize();
// }
// else
// {
// return 0;
// }
}
void FairMQMessageSHM::SetMessage(void*, const size_t)
@@ -315,81 +257,15 @@ void FairMQMessageSHM::Copy(const unique_ptr<FairMQMessage>& msg)
{
LOG(ERROR) << "FairMQMessageSHM::Copy() fail: target message already initialized!";
}
// version with sharing the sent data
// if (!fOwner)
// {
// if (static_cast<FairMQMessageSHM*>(msg.get())->fOwner)
// {
// string* ownerID = new string(fDeviceID + "o" + to_string(fMessageID));
// bool success = false;
// do
// {
// try
// {
// fOwner = Manager::Instance().Segment()->construct<ShPtrOwner>(ownerID->c_str())(*(static_cast<FairMQMessageSHM*>(msg.get())->fOwner));
// success = true;
// }
// catch (bipc::bad_alloc& ba)
// {
// LOG(WARN) << "Shared memory full...";
// this_thread::sleep_for(chrono::milliseconds(10));
// if (fInterrupted)
// {
// break;
// }
// else
// {
// continue;
// }
// }
// }
// while (!success);
// if (zmq_msg_init_data(&fMessage, const_cast<char*>(ownerID->c_str()), ownerID->length(), StringDeleter, ownerID) != 0)
// {
// LOG(ERROR) << "failed initializing meta message, reason: " << zmq_strerror(errno);
// }
// ++fMessageID;
// }
// else
// {
// LOG(ERROR) << "FairMQMessageSHM::Copy() fail: source message not initialized!";
// }
// }
// else
// {
// LOG(ERROR) << "FairMQMessageSHM::Copy() fail: target message already initialized!";
// }
}
void FairMQMessageSHM::CloseMessage()
{
// if (fReceiving)
// {
// if (fOwner)
// {
// Manager::Instance().Segment()->destroy_ptr(fOwner);
// fOwner = nullptr;
// }
// else
// {
// LOG(ERROR) << "No shared pointer owner when closing a received message";
// }
// }
// else
// {
if (fHandle && !fQueued && fRegionId == 0)
{
// LOG(WARN) << "Destroying unsent message";
// Manager::Instance().Segment()->destroy_ptr(fHandle);
Manager::Instance().Segment()->deallocate(Manager::Instance().Segment()->get_address_from_handle(fHandle));
fHandle = 0;
}
// }
if (fHandle && !fQueued && fRegionId == 0)
{
Manager::Instance().Segment()->deallocate(Manager::Instance().Segment()->get_address_from_handle(fHandle));
fHandle = 0;
}
if (fMetaCreated)
{