mirror of
https://github.com/FairRootGroup/FairMQ.git
synced 2025-10-15 09:31:45 +00:00
Adding multiple transports support & other fixes:
- Avoid polling when only one input channel is used. - Send only handles for shared memory transport. - Avoid waiting in the rate logger thread when nothing to log. - Hide warnings from generated files - Fix #483
This commit is contained in:
Alexey Rybalchenko
committed by
Mohammad Al-Turany
Mohammad Al-Turany
parent
e53ad151a7
commit
c66fd6fe91
@@ -14,45 +14,60 @@
|
||||
using namespace std;
|
||||
using namespace FairMQ::shmem;
|
||||
|
||||
uint64_t FairMQMessageSHM::fMessageID = 0;
|
||||
string FairMQMessageSHM::fDeviceID = string();
|
||||
static FairMQ::Transport gTransportType = FairMQ::Transport::SHM;
|
||||
|
||||
// uint64_t FairMQMessageSHM::fMessageID = 0;
|
||||
// string FairMQMessageSHM::fDeviceID = string();
|
||||
atomic<bool> FairMQMessageSHM::fInterrupted(false);
|
||||
|
||||
FairMQMessageSHM::FairMQMessageSHM()
|
||||
: fMessage()
|
||||
, fOwner(nullptr)
|
||||
, fReceiving(false)
|
||||
// , fOwner(nullptr)
|
||||
// , fReceiving(false)
|
||||
, fQueued(false)
|
||||
, fMetaCreated(false)
|
||||
, fHandle()
|
||||
, fChunkSize(0)
|
||||
, fLocalPtr(nullptr)
|
||||
{
|
||||
if (zmq_msg_init(&fMessage) != 0)
|
||||
{
|
||||
LOG(ERROR) << "failed initializing message, reason: " << zmq_strerror(errno);
|
||||
}
|
||||
fMetaCreated = true;
|
||||
}
|
||||
|
||||
void FairMQMessageSHM::StringDeleter(void* /*data*/, void* str)
|
||||
{
|
||||
delete static_cast<string*>(str);
|
||||
}
|
||||
// void FairMQMessageSHM::StringDeleter(void* /*data*/, void* str)
|
||||
// {
|
||||
// delete static_cast<string*>(str);
|
||||
// }
|
||||
|
||||
FairMQMessageSHM::FairMQMessageSHM(const size_t size)
|
||||
: fMessage()
|
||||
, fOwner(nullptr)
|
||||
, fReceiving(false)
|
||||
// , fOwner(nullptr)
|
||||
// , fReceiving(false)
|
||||
, fQueued(false)
|
||||
, fMetaCreated(false)
|
||||
, fHandle()
|
||||
, fChunkSize(0)
|
||||
, fLocalPtr(nullptr)
|
||||
{
|
||||
InitializeChunk(size);
|
||||
}
|
||||
|
||||
FairMQMessageSHM::FairMQMessageSHM(void* data, const size_t size, fairmq_free_fn* ffn, void* hint)
|
||||
: fMessage()
|
||||
, fOwner(nullptr)
|
||||
, fReceiving(false)
|
||||
// , fOwner(nullptr)
|
||||
// , fReceiving(false)
|
||||
, fQueued(false)
|
||||
, fMetaCreated(false)
|
||||
, fHandle()
|
||||
, fChunkSize(0)
|
||||
, fLocalPtr(nullptr)
|
||||
{
|
||||
if (InitializeChunk(size))
|
||||
{
|
||||
memcpy(fOwner->fPtr->GetData(), data, size);
|
||||
memcpy(fLocalPtr, data, size);
|
||||
if (ffn)
|
||||
{
|
||||
ffn(data, hint);
|
||||
@@ -66,66 +81,76 @@ FairMQMessageSHM::FairMQMessageSHM(void* data, const size_t size, fairmq_free_fn
|
||||
|
||||
bool FairMQMessageSHM::InitializeChunk(const size_t size)
|
||||
{
|
||||
string chunkID = fDeviceID + "c" + to_string(fMessageID);
|
||||
string* ownerID = new string(fDeviceID + "o" + to_string(fMessageID));
|
||||
// string chunkID = fDeviceID + "c" + to_string(fMessageID);
|
||||
// string* ownerID = new string(fDeviceID + "o" + to_string(fMessageID));
|
||||
|
||||
bool success = false;
|
||||
|
||||
while (!success)
|
||||
while (!fHandle)
|
||||
{
|
||||
try
|
||||
{
|
||||
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())));
|
||||
success = true;
|
||||
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)
|
||||
{
|
||||
LOG(WARN) << "Shared memory full...";
|
||||
// LOG(WARN) << "Shared memory full...";
|
||||
this_thread::sleep_for(chrono::milliseconds(50));
|
||||
if (fInterrupted)
|
||||
{
|
||||
break;
|
||||
return false;
|
||||
}
|
||||
else
|
||||
{
|
||||
continue;
|
||||
}
|
||||
}
|
||||
fHandle = Manager::Instance().Segment()->get_handle_from_address(fLocalPtr);
|
||||
}
|
||||
|
||||
if (success)
|
||||
fChunkSize = size;
|
||||
|
||||
if (zmq_msg_init_size(&fMessage, sizeof(MetaHeader)) != 0)
|
||||
{
|
||||
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;
|
||||
LOG(ERROR) << "failed initializing meta message, reason: " << zmq_strerror(errno);
|
||||
return false;
|
||||
}
|
||||
MetaHeader* metaPtr = new(zmq_msg_data(&fMessage)) MetaHeader();
|
||||
metaPtr->fSize = size;
|
||||
metaPtr->fHandle = fHandle;
|
||||
|
||||
return 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);
|
||||
// }
|
||||
fMetaCreated = true;
|
||||
|
||||
// ++fMessageID;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
void FairMQMessageSHM::Rebuild()
|
||||
{
|
||||
CloseMessage();
|
||||
|
||||
fReceiving = false;
|
||||
// fReceiving = false;
|
||||
fQueued = false;
|
||||
|
||||
if (zmq_msg_init(&fMessage) != 0)
|
||||
{
|
||||
LOG(ERROR) << "failed initializing message, reason: " << zmq_strerror(errno);
|
||||
}
|
||||
fMetaCreated = true;
|
||||
}
|
||||
|
||||
void FairMQMessageSHM::Rebuild(const size_t size)
|
||||
{
|
||||
CloseMessage();
|
||||
|
||||
fReceiving = false;
|
||||
// fReceiving = false;
|
||||
fQueued = false;
|
||||
|
||||
InitializeChunk(size);
|
||||
@@ -135,12 +160,12 @@ void FairMQMessageSHM::Rebuild(void* data, const size_t size, fairmq_free_fn* ff
|
||||
{
|
||||
CloseMessage();
|
||||
|
||||
fReceiving = false;
|
||||
// fReceiving = false;
|
||||
fQueued = false;
|
||||
|
||||
if (InitializeChunk(size))
|
||||
{
|
||||
memcpy(fOwner->fPtr->GetData(), data, size);
|
||||
memcpy(fLocalPtr, data, size);
|
||||
if (ffn)
|
||||
{
|
||||
ffn(data, hint);
|
||||
@@ -159,27 +184,42 @@ void* FairMQMessageSHM::GetMessage()
|
||||
|
||||
void* FairMQMessageSHM::GetData()
|
||||
{
|
||||
if (fOwner)
|
||||
if (fLocalPtr)
|
||||
{
|
||||
return fOwner->fPtr->GetData();
|
||||
return fLocalPtr;
|
||||
}
|
||||
else if (fHandle)
|
||||
{
|
||||
return Manager::Instance().Segment()->get_address_from_handle(fHandle);
|
||||
}
|
||||
else
|
||||
{
|
||||
LOG(ERROR) << "Trying to get data of an empty shared memory message";
|
||||
exit(EXIT_FAILURE);
|
||||
// LOG(ERROR) << "Trying to get data of an empty shared memory message";
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
// 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()
|
||||
{
|
||||
if (fOwner)
|
||||
{
|
||||
return fOwner->fPtr->GetSize();
|
||||
}
|
||||
else
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
return fChunkSize;
|
||||
// if (fOwner)
|
||||
// {
|
||||
// return fOwner->fPtr->GetSize();
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
// return 0;
|
||||
// }
|
||||
}
|
||||
|
||||
void FairMQMessageSHM::SetMessage(void*, const size_t)
|
||||
@@ -187,21 +227,26 @@ void FairMQMessageSHM::SetMessage(void*, const size_t)
|
||||
// dummy method to comply with the interface. functionality not allowed in zeromq.
|
||||
}
|
||||
|
||||
void FairMQMessageSHM::SetDeviceId(const string& deviceId)
|
||||
void FairMQMessageSHM::SetDeviceId(const string& /*deviceId*/)
|
||||
{
|
||||
fDeviceID = deviceId;
|
||||
// fDeviceID = deviceId;
|
||||
}
|
||||
|
||||
FairMQ::Transport FairMQMessageSHM::GetType() const
|
||||
{
|
||||
return gTransportType;
|
||||
}
|
||||
|
||||
void FairMQMessageSHM::Copy(const unique_ptr<FairMQMessage>& msg)
|
||||
{
|
||||
if (!fOwner)
|
||||
if (!fHandle)
|
||||
{
|
||||
FairMQ::shmem::ShPtrOwner* otherOwner = static_cast<FairMQMessageSHM*>(msg.get())->fOwner;
|
||||
if (otherOwner)
|
||||
bipc::managed_shared_memory::handle_t otherHandle = static_cast<FairMQMessageSHM*>(msg.get())->fHandle;
|
||||
if (otherHandle)
|
||||
{
|
||||
if (InitializeChunk(otherOwner->fPtr->GetSize()))
|
||||
if (InitializeChunk(msg->GetSize()))
|
||||
{
|
||||
memcpy(fOwner->fPtr->GetData(), otherOwner->fPtr->GetData(), otherOwner->fPtr->GetSize());
|
||||
memcpy(GetData(), msg->GetData(), msg->GetSize());
|
||||
}
|
||||
}
|
||||
else
|
||||
@@ -266,31 +311,35 @@ void FairMQMessageSHM::Copy(const unique_ptr<FairMQMessage>& msg)
|
||||
|
||||
void FairMQMessageSHM::CloseMessage()
|
||||
{
|
||||
if (fReceiving)
|
||||
{
|
||||
if (fOwner)
|
||||
// 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)
|
||||
{
|
||||
Manager::Instance().Segment()->destroy_ptr(fOwner);
|
||||
fOwner = nullptr;
|
||||
// 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;
|
||||
}
|
||||
else
|
||||
{
|
||||
LOG(ERROR) << "No shared pointer owner when closing a received message";
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (fOwner && !fQueued)
|
||||
{
|
||||
LOG(WARN) << "Destroying unsent message";
|
||||
Manager::Instance().Segment()->destroy_ptr(fOwner);
|
||||
fOwner = nullptr;
|
||||
}
|
||||
}
|
||||
// }
|
||||
|
||||
if (zmq_msg_close(&fMessage) != 0)
|
||||
if (fMetaCreated)
|
||||
{
|
||||
LOG(ERROR) << "failed closing message, reason: " << zmq_strerror(errno);
|
||||
if (zmq_msg_close(&fMessage) != 0)
|
||||
{
|
||||
LOG(ERROR) << "failed closing message, reason: " << zmq_strerror(errno);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user