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

waiter_map_t : concept changed

Browse source 
Purpose-specific waiter_map_t objects instead of global one. SM_Sleep()
removed.
This commit is contained in:
Nekotekina 2014-10-16 20:29:41 +04:00
parent 48eb66383b
commit 18b69cac99
10 changed files with 86 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

20
rpcs3/Emu/SysCalls/Modules/cellSync.cpp
View file

@ -16,6 +16,10 @@ u32 libsre;
u32 libsre_rtoc;
#endif
waiter_map_t sync_mutex_wm("sync_mutex_wm");
waiter_map_t sync_barrier_wait_wm("sync_barrier_wait_wm");
waiter_map_t sync_barrier_notify_wm("sync_barrier_notify_wm");
s32 syncMutexInitialize(vm::ptr<CellSyncMutex> mutex)
{
if (!mutex)
@ -60,7 +64,7 @@ s32 cellSyncMutexLock(vm::ptr<CellSyncMutex> mutex)
});
// prx: wait until this old value is equal to m_rel
waiter_op(__FUNCTION__, mutex.addr(), [mutex, order]()
sync_mutex_wm.waiter_op(mutex.addr(), [mutex, order]()
{
return order == mutex->data.read_relaxed().m_rel;
});
@ -112,7 +116,7 @@ s32 cellSyncMutexUnlock(vm::ptr<CellSyncMutex> mutex)
mutex.m_rel++;
});
waiter_signal(mutex.addr());
sync_mutex_wm.notify(mutex.addr());
return CELL_OK;
}
@ -174,12 +178,12 @@ s32 cellSyncBarrierNotify(vm::ptr<CellSyncBarrier> barrier)
return CELL_SYNC_ERROR_ALIGN;
}
waiter_op(__FUNCTION__, barrier.addr(), [barrier]()
sync_barrier_notify_wm.waiter_op(barrier.addr(), [barrier]()
{
return barrier->data.atomic_op_sync(CELL_OK, syncBarrierTryNotifyOp) == CELL_OK;
});
waiter_signal(barrier.addr() ^ 1);
sync_barrier_wait_wm.notify(barrier.addr());
return CELL_OK;
}
@ -201,7 +205,7 @@ s32 cellSyncBarrierTryNotify(vm::ptr<CellSyncBarrier> barrier)
return res;
}
waiter_signal(barrier.addr() ^ 1);
sync_barrier_wait_wm.notify(barrier.addr());
return CELL_OK;
}
@ -236,12 +240,12 @@ s32 cellSyncBarrierWait(vm::ptr<CellSyncBarrier> barrier)
return CELL_SYNC_ERROR_ALIGN;
}
waiter_op(__FUNCTION__, barrier.addr() ^ 1, [barrier]()
sync_barrier_wait_wm.waiter_op(barrier.addr(), [barrier]()
{
return barrier->data.atomic_op_sync(CELL_OK, syncBarrierTryWaitOp) == CELL_OK;
});
waiter_signal(barrier.addr());
sync_barrier_notify_wm.notify(barrier.addr());
return CELL_OK;
}
@ -263,7 +267,7 @@ s32 cellSyncBarrierTryWait(vm::ptr<CellSyncBarrier> barrier)
return res;
}
waiter_signal(barrier.addr());
sync_barrier_notify_wm.notify(barrier.addr());
return CELL_OK;
}