archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-14 10:48:36 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Cleanup semaphore<> (sema.h) and mutex.h (shared_mutex)

Browse source 
Remove semaphore_lock and writer_lock classes, replace with std::lock_guard
Change semaphore<> interface to Lockable (+ exotic try_unlock method)
This commit is contained in:
Nekotekina 2018-09-03 22:28:33 +03:00
parent 5e556a87ff
commit ca5158a03e
50 changed files with 283 additions and 382 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -395,7 +395,7 @@ error_code sys_fs_read(u32 fd, vm::ptr<void> buf, u64 nbytes, vm::ptr<u64> nread
return CELL_EBADF;
}
std::lock_guard<std::mutex> lock(file->mp->mutex);
std::lock_guard lock(file->mp->mutex);
*nread = file->op_read(buf, nbytes);
@ -413,7 +413,7 @@ error_code sys_fs_write(u32 fd, vm::cptr<void> buf, u64 nbytes, vm::ptr<u64> nwr
return CELL_EBADF;
}
std::lock_guard<std::mutex> lock(file->mp->mutex);
std::lock_guard lock(file->mp->mutex);
if (file->lock)
{
@ -638,7 +638,7 @@ error_code sys_fs_fstat(u32 fd, vm::ptr<CellFsStat> sb)
return CELL_EBADF;
}
std::lock_guard<std::mutex> lock(file->mp->mutex);
std::lock_guard lock(file->mp->mutex);
const fs::stat_t& info = file->file.stat();
@ -862,7 +862,7 @@ error_code sys_fs_fcntl(u32 fd, u32 op, vm::ptr<void> _arg, u32 _size)
return CELL_EBADF;
}
std::lock_guard<std::mutex> lock(file->mp->mutex);
std::lock_guard lock(file->mp->mutex);
if (op == 0x8000000b && file->lock)
{
@ -1207,7 +1207,7 @@ error_code sys_fs_lseek(u32 fd, s64 offset, s32 whence, vm::ptr<u64> pos)
return CELL_EBADF;
}
std::lock_guard<std::mutex> lock(file->mp->mutex);
std::lock_guard lock(file->mp->mutex);
const u64 result = file->file.seek(offset, static_cast<fs::seek_mode>(whence));
@ -1337,7 +1337,7 @@ error_code sys_fs_ftruncate(u32 fd, u64 size)
return CELL_EBADF;
}
std::lock_guard<std::mutex> lock(file->mp->mutex);
std::lock_guard lock(file->mp->mutex);
if (file->lock)
{