Mirror/FairMQ
1
0
Fork 0
mirror of https://github.com/FairRootGroup/FairMQ.git synced 2025-10-13 16:46:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

apply readability-else-after-return

Browse Source
This commit is contained in:
Alexey Rybalchenko 2023-09-28 11:44:03 +02:00
parent 1a0ab3a4e2
commit 7bd31f8ff0
1 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
fairmq/shmem/Manager.h
View File

@ -397,33 +397,33 @@ class Manager
auto it = fRegions.find(id); auto it = fRegions.find(id);
if (it != fRegions.end()) { if (it != fRegions.end()) {
return it->second.get(); return it->second.get();
} else { }
try {
RegionConfig cfg;
const uint64_t rcSegmentSize = cfg.rcSegmentSize;
// get region info
{
boost::interprocess::scoped_lock<boost::interprocess::interprocess_mutex> shmLock(*fShmMtx);
RegionInfo regionInfo = fShmRegions->at(id);
cfg.id = id;
cfg.creationFlags = regionInfo.fCreationFlags;
cfg.path = regionInfo.fPath.c_str();
}
// LOG(debug) << "Located remote region with id '" << id << "', path: '" << cfg.path << "', flags: '" << cfg.creationFlags << "'";
auto r = fRegions.emplace(id, std::make_unique<UnmanagedRegion>(fShmId, 0, false, std::move(cfg))); try {
r.first->second->InitializeRefCountSegment(rcSegmentSize); RegionConfig cfg;
r.first->second->InitializeQueues(); const uint64_t rcSegmentSize = cfg.rcSegmentSize;
r.first->second->StartAckSender(); // get region info
return r.first->second.get(); {
} catch (std::out_of_range& oor) { boost::interprocess::scoped_lock<boost::interprocess::interprocess_mutex> shmLock(*fShmMtx);
LOG(error) << "Could not get remote region with id '" << id << "'. Does the region creator run with the same session id?"; RegionInfo regionInfo = fShmRegions->at(id);
LOG(error) << oor.what(); cfg.id = id;
return nullptr; cfg.creationFlags = regionInfo.fCreationFlags;
} catch (boost::interprocess::interprocess_exception& e) { cfg.path = regionInfo.fPath.c_str();
LOG(error) << "Could not get remote region for id '" << id << "': " << e.what();
return nullptr;
} }
// LOG(debug) << "Located remote region with id '" << id << "', path: '" << cfg.path << "', flags: '" << cfg.creationFlags << "'";
auto r = fRegions.emplace(id, std::make_unique<UnmanagedRegion>(fShmId, 0, false, std::move(cfg)));
r.first->second->InitializeRefCountSegment(rcSegmentSize);
r.first->second->InitializeQueues();
r.first->second->StartAckSender();
return r.first->second.get();
} catch (std::out_of_range& oor) {
LOG(error) << "Could not get remote region with id '" << id << "'. Does the region creator run with the same session id?";
LOG(error) << oor.what();
return nullptr;
} catch (boost::interprocess::interprocess_exception& e) {
LOG(error) << "Could not get remote region for id '" << id << "': " << e.what();
return nullptr;
} }
} }