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

shm region cache: fix multiple sessions issue

Browse Source
This commit is contained in:
Alexey Rybalchenko 2021-05-06 23:13:11 +02:00
parent 87e0ca5450
commit 2ca62d06db
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fairmq/shmem/Manager.h
View File

@ -44,6 +44,7 @@
#include <thread> #include <thread>
#include <unordered_map> #include <unordered_map>
#include <utility> // pair #include <utility> // pair
#include <tuple>
#include <vector> #include <vector>
#include <unistd.h> // getuid #include <unistd.h> // getuid
@ -58,7 +59,8 @@ class Manager
{ {
public: public:
Manager(const std::string& sessionName, std::string deviceId, size_t size, const ProgOptions* config) Manager(const std::string& sessionName, std::string deviceId, size_t size, const ProgOptions* config)
: fShmId(makeShmIdStr(sessionName)) : fShmId64(makeShmIdUint64(sessionName))
, fShmId(makeShmIdStr(sessionName))
, fSegmentId(config ? config->GetProperty<uint16_t>("shm-segment-id", 0) : 0) , fSegmentId(config ? config->GetProperty<uint16_t>("shm-segment-id", 0) : 0)
, fDeviceId(std::move(deviceId)) , fDeviceId(std::move(deviceId))
, fSegments() , fSegments()
@ -337,8 +339,8 @@ class Manager
// fast path // fast path
for (const auto &lRegion : lTlCacheVec) { for (const auto &lRegion : lTlCacheVec) {
if ((lRegion.second == id) && (lTlCacheGen == fRegionsGen)) { if ((std::get<1>(lRegion) == id) && (lTlCacheGen == fRegionsGen) && (std::get<2>(lRegion) == fShmId64)) {
return lRegion.first; return std::get<0>(lRegion);
} }
} }
@ -349,7 +351,7 @@ class Manager
} }
auto *lRegion = GetRegionUnsafe(id); auto *lRegion = GetRegionUnsafe(id);
fTlRegionCache.fRegionsTLCache.emplace_back(std::make_pair(lRegion, id)); fTlRegionCache.fRegionsTLCache.emplace_back(std::make_tuple(lRegion, id, fShmId64));
fTlRegionCache.fRegionsTLCacheGen = fRegionsGen; fTlRegionCache.fRegionsTLCacheGen = fRegionsGen;
return lRegion; return lRegion;
} }
@ -670,6 +672,7 @@ class Manager
} }
private: private:
uint64_t fShmId64;
std::string fShmId; std::string fShmId;
uint16_t fSegmentId; uint16_t fSegmentId;
std::string fDeviceId; std::string fDeviceId;
@ -694,7 +697,7 @@ class Manager
alignas(128) inline static std::atomic<unsigned long> fRegionsGen = 0ul; alignas(128) inline static std::atomic<unsigned long> fRegionsGen = 0ul;
inline static thread_local struct ManagerTLCache { inline static thread_local struct ManagerTLCache {
unsigned long fRegionsTLCacheGen; unsigned long fRegionsTLCacheGen;
std::vector<std::pair<Region*, uint16_t>> fRegionsTLCache; std::vector<std::tuple<Region*, uint16_t, uint64_t>> fRegionsTLCache;
} fTlRegionCache; } fTlRegionCache;
std::atomic<bool> fInterrupted; std::atomic<bool> fInterrupted;