Merge branch 'sm/legion_htr_ipc' into 'master'

test fix for htr/ipc lock See merge request StanfordLegion/legion!1342
StanfordLegion · Jun 26, 2024 · 9a9989d · 9a9989d
2 parents 74f7a61 + db3991a
commit 9a9989d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/runtime/realm/cuda/cuda_internal.h b/runtime/realm/cuda/cuda_internal.h
@@ -739,7 +739,7 @@ namespace Realm {
       };
       std::vector<CudaIpcMapping> cudaipc_mappings;
       std::map<NodeID, GPUStream *> cudaipc_streams;
-
+      Mutex alloc_mutex;
       const CudaIpcMapping *find_ipc_mapping(Memory mem) const;
 
 #ifdef REALM_USE_CUDART_HIJACK

diff --git a/runtime/realm/cuda/cuda_module.cc b/runtime/realm/cuda/cuda_module.cc
@@ -3608,6 +3608,7 @@ namespace Realm {
 
     GPUAllocation &GPU::add_allocation(GPUAllocation &&alloc)
     {
+      AutoLock<> al(alloc_mutex);
       assert(((!!alloc) && (alloc.get_dptr() != 0)) && "Given allocation is not valid!");
       return allocations.emplace(std::make_pair(alloc.get_dptr(), std::move(alloc)))
           .first->second;