OmniNX/Atmosphere
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

thermosphere: uninline recursive lock funcs

Browse Source
This commit is contained in:
TuxSH
2020-01-21 00:05:01 +00:00
parent 217c1ad054
commit c64ccd86ee
5 changed files with 42 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
thermosphere/src/spinlock.h
View File

@@ -16,7 +16,6 @@
#pragma once
#include "core_ctx.h"
#include "utils.h"
#include "sysreg.h"
@@ -51,6 +50,8 @@ static inline void restoreInterruptFlags(u64 flags)
void spinlockLock(Spinlock *lock);
void spinlockUnlock(Spinlock *lock);
void recursiveSpinlockLock(RecursiveSpinlock *lock);
void recursiveSpinlockUnlock(RecursiveSpinlock *lock);
static inline u64 spinlockLockMaskIrq(Spinlock *lock)
{
@@ -65,25 +66,6 @@ static inline void spinlockUnlockRestoreIrq(Spinlock *lock, u64 flags)
restoreInterruptFlags(flags);
}
static inline void recursiveSpinlockLock(RecursiveSpinlock *lock)
{
if (lock->tag != currentCoreCtx->coreId + 1) {
spinlockLock(&lock->lock);
lock->tag = currentCoreCtx->coreId + 1;
lock->count = 1;
} else {
++lock->count;
}
}
static inline void recursiveSpinlockUnlock(RecursiveSpinlock *lock)
{
if (--lock->count == 0) {
lock->tag = 0;
spinlockUnlock(&lock->lock);
}
}
static inline u64 recursiveSpinlockLockMaskIrq(RecursiveSpinlock *lock)
{
u64 ret = maskIrq();