From 2c2770204fd4e92cfe05bd34cd87cd78dfa4946d Mon Sep 17 00:00:00 2001 From: Alexey Rybalchenko Date: Wed, 24 Jan 2018 12:46:04 +0100 Subject: [PATCH] Fix missing session name resize if running without FairMQProgOptions --- fairmq/shmem/FairMQTransportFactorySHM.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fairmq/shmem/FairMQTransportFactorySHM.cxx b/fairmq/shmem/FairMQTransportFactorySHM.cxx index e0dfd6bc..dad365a5 100644 --- a/fairmq/shmem/FairMQTransportFactorySHM.cxx +++ b/fairmq/shmem/FairMQTransportFactorySHM.cxx @@ -35,7 +35,7 @@ FairMQ::Transport FairMQTransportFactorySHM::fTransportType = FairMQ::Transport: FairMQTransportFactorySHM::FairMQTransportFactorySHM(const string& id, const FairMQProgOptions* config) : FairMQTransportFactory(id) - , fSessionName() + , fSessionName("default") , fContext(nullptr) , fHeartbeatSocket(nullptr) , fHeartbeatThread() @@ -62,8 +62,6 @@ FairMQTransportFactorySHM::FairMQTransportFactorySHM(const string& id, const Fai { numIoThreads = config->GetValue("io-threads"); fSessionName = config->GetValue("session"); - fSessionName.resize(8, '_'); // shorten the session name, to accommodate for name size limit on some systems (MacOS) - // fSegmentName = "fmq_shm_" + fSessionName + "_main"; segmentSize = config->GetValue("shm-segment-size"); } else @@ -71,6 +69,8 @@ FairMQTransportFactorySHM::FairMQTransportFactorySHM(const string& id, const Fai LOG(warn) << "FairMQProgOptions not available! Using defaults."; } + fSessionName.resize(8, '_'); // shorten the session name, to accommodate for name size limit on some systems (MacOS) + try { fShMutex = fair::mq::tools::make_unique(bipc::open_or_create, std::string("fmq_shm_" + fSessionName + "_mutex").c_str());