Impaczus/rpcs3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core: Move IDM to FXO

Browse Source
This commit is contained in:
Eladash
2021-03-30 19:37:51 +03:00
committed by Ivan
parent bf1756448e
commit 4a9be0a8d2
3 changed files with 43 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rpcs3/Emu/IdManager.cpp
+3 -32
View File
@@ -5,22 +5,15 @@
shared_mutex id_manager::g_mutex;
thread_local DECLARE(idm::g_id);
DECLARE(idm::g_map);
id_manager::id_map::pointer idm::allocate_id(const id_manager::id_key& info, u32 base, u32 step, u32 count, std::pair<u32, u32> invl_range)
idm::map_data* idm::allocate_id(std::vector<map_data>& vec, u32 type_id, u32 base, u32 step, u32 count, std::pair<u32, u32> invl_range)
{
// Base type id is stored in value
auto& vec = g_map[info.value()];
// Preallocate memory
vec.reserve(count);
if (vec.size() < count)
{
// Try to emplace back
const u32 _next = base + step * ::size32(vec);
g_id = _next;
vec.emplace_back(id_manager::id_key(_next, info.type()), nullptr);
vec.emplace_back(id_manager::id_key(_next, type_id), nullptr);
return &vec.back();
}
@@ -35,7 +28,7 @@ id_manager::id_map::pointer idm::allocate_id(const id_manager::id_key& info, u32
// Incremenet ID invalidation counter
const u32 id = next | ((ptr->first + (1u << invl_range.first)) & (invl_range.second ? (((1u << invl_range.second) - 1) << invl_range.first) : 0));
g_id = id;
ptr->first = id_manager::id_key(id, info.type());
ptr->first = id_manager::id_key(id, type_id);
return ptr;
}
}
@@ -43,25 +36,3 @@ id_manager::id_map::pointer idm::allocate_id(const id_manager::id_key& info, u32
// Out of IDs
return nullptr;
}
void idm::init()
{
// Allocate
g_map.resize(id_manager::typeinfo::get_count());
idm::clear();
}
void idm::clear()
{
// Call recorded finalization functions for all IDs
for (auto& map : g_map)
{
for (auto& pair : map)
{
pair.second.reset();
pair.first = {};
}
map.clear();
}
}