archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-12 17:58:37 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix sys_fs_close FD state logging

Browse source
This commit is contained in:
Eladash 2022-01-24 10:13:54 +02:00 • committed by Ivan
parent 254ddcad51
commit e39797d860
1 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

30
rpcs3/Emu/Cell/lv2/sys_fs.cpp
View file

@ -834,11 +834,19 @@ error_code sys_fs_close(ppu_thread& ppu, u32 fd)
return {CELL_EBADF, fd}; return {CELL_EBADF, fd};
} }
std::string FD_state_log;
if (sys_fs.warning)
{
FD_state_log = fmt::format("sys_fs_close(fd=%u)", fd);
}
{ {
std::lock_guard lock(file->mp->mutex); std::lock_guard lock(file->mp->mutex);
if (!file->file) if (!file->file)
{ {
sys_fs.warning("%s", FD_state_log);
return {CELL_EBADF, fd}; return {CELL_EBADF, fd};
} }
@ -848,32 +856,24 @@ error_code sys_fs_close(ppu_thread& ppu, u32 fd)
file->file.sync(); // For cellGameContentPermit atomicity file->file.sync(); // For cellGameContentPermit atomicity
} }
if (!FD_state_log.empty())
{
sys_fs.warning("%s: %s", FD_state_log, *file);
}
// Ensure Host file handle won't be kept open after this syscall // Ensure Host file handle won't be kept open after this syscall
file->file.close(); file->file.close();
} }
const auto ret = idm::withdraw<lv2_fs_object, lv2_file>(fd, [&](lv2_file& _file) -> CellError ensure(idm::withdraw<lv2_fs_object, lv2_file>(fd, [&](lv2_file& _file) -> CellError
{ {
if (file.get() != std::addressof(_file))
{
// Other thread destroyed the object inbetween
return CELL_EBADF;
}
if (_file.type >= lv2_file_type::sdata) if (_file.type >= lv2_file_type::sdata)
{ {
g_fxo->get<loaded_npdrm_keys>().npdrm_fds--; g_fxo->get<loaded_npdrm_keys>().npdrm_fds--;
} }
return {}; return {};
}); }));
if (!ret || ret.ret == CELL_EBADF)
{
return {CELL_EBADF, fd};
}
sys_fs.warning("sys_fs_close(fd=%u): %s", fd, *file);
if (file->lock == 1) if (file->lock == 1)
{ {