Emulator-Archive/psOff_public
1
0
Fork 0
mirror of https://github.com/SysRay/psOff_public.git synced 2024-11-23 06:19:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

runtimeLinker| use recursive mutex

Browse Source
This commit is contained in:
SysRay 2024-05-27 18:31:08 +02:00
parent 28baf06eb6
commit 9433eeba4f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/runtime/runtimeLinker.cpp
View File

@ -184,7 +184,7 @@ class InternalLib: public Symbols::IResolve {
class RuntimeLinker: public IRuntimeLinker {
private:
mutable std::mutex m_mutex_int;
mutable std::recursive_mutex m_mutex_int;
uint64_t m_invalidMemoryAddr = 0;
size_t m_countcreatePrograms = 0;
@ -530,13 +530,13 @@ void RuntimeLinker::loadModules(std::string_view libName) {
int RuntimeLinker::loadStartModule(std::filesystem::path const& path, size_t argc, const void* argp, int* pRes) {
LOG_USE_MODULE(RuntimeLinker);
std::unique_lock const lock(m_mutex_int);
// check if already loaded
auto fileName = path.filename().string();
if (auto it = std::find_if(m_programList.begin(), m_programList.end(),
[&fileName](std::pair<std::unique_ptr<Program>, std::shared_ptr<IFormat>>& rhs) { return rhs.first->filename == fileName; });
it != m_programList.end()) {
LOG_ERR(L"Already loaded %s", path.c_str());
return it->first->id;
}
// -