enderice2/Fennix
1
0
Fork 0
mirror of https://github.com/EnderIce2/Fennix.git synced 2025-07-08 13:59:17 +00:00
Code Issues Actions Releases Wiki Activity

Implement std::atomic and remove the old implementation Atomic and rename vector.hpp to vector

Browse Source
This commit is contained in:
Alex
2023-04-10 05:29:41 +03:00
parent b4dbf2c281
commit 70e11f17e7
31 changed files with 718 additions and 352 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Core/Lock.cpp
View File

@ -29,7 +29,7 @@
#endif
bool ForceUnlock = false;
Atomic<size_t> LocksCount = 0;
std::atomic_size_t LocksCount = 0;
size_t GetLocksCount() { return LocksCount; }
@ -75,7 +75,7 @@ void LockClass::DeadLock(SpinLockData Lock)
this->DeadLocks++;
if (Config.UnlockDeadLock && this->DeadLocks.Load() > 10)
if (Config.UnlockDeadLock && this->DeadLocks.load() > 10)
{
warn("Unlocking lock '%s' to prevent deadlock. (this is enabled in the kernel config)", Lock.AttemptingToGet);
this->DeadLocks = 0;
@ -93,7 +93,7 @@ int LockClass::Lock(const char *FunctionName)
Retry:
int i = 0;
while (IsLocked.Exchange(true, MemoryOrder::Acquire) && ++i < (DebuggerIsAttached ? 0x100000 : 0x10000000))
while (IsLocked.exchange(true, std::memory_order_acquire) && ++i < (DebuggerIsAttached ? 0x100000 : 0x10000000))
CPU::Pause();
if (i >= (DebuggerIsAttached ? 0x100000 : 0x10000000))
@ -120,7 +120,7 @@ int LockClass::Unlock()
{
__sync;
IsLocked.Store(false, MemoryOrder::Release);
IsLocked.store(false, std::memory_order_release);
LockData.Count--;
LocksCount--;
@ -178,17 +178,17 @@ int LockClass::TimeoutLock(const char *FunctionName, uint64_t Timeout)
LockData.AttemptingToGet = FunctionName;
LockData.StackPointerAttempt = (uintptr_t)__builtin_frame_address(0);
Atomic<uint64_t> Target = 0;
std::atomic_uint64_t Target = 0;
Retry:
int i = 0;
while (IsLocked.Exchange(true, MemoryOrder::Acquire) && ++i < (DebuggerIsAttached ? 0x100000 : 0x10000000))
while (IsLocked.exchange(true, std::memory_order_acquire) && ++i < (DebuggerIsAttached ? 0x100000 : 0x10000000))
CPU::Pause();
if (i >= (DebuggerIsAttached ? 0x100000 : 0x10000000))
{
if (Target.Load() == 0)
Target.Store(TimeManager->CalculateTarget(Timeout));
TimeoutDeadLock(LockData, Target.Load());
if (Target.load() == 0)
Target.store(TimeManager->CalculateTarget(Timeout));
TimeoutDeadLock(LockData, Target.load());
goto Retry;
}