diff options
| -rw-r--r-- | src/kernel/KernelKit/BinaryMutex.h | 4 | ||||
| -rw-r--r-- | src/kernel/KernelKit/CoreProcessScheduler.h | 2 | ||||
| -rw-r--r-- | src/kernel/src/BinaryMutex.cpp | 12 | ||||
| -rw-r--r-- | src/kernel/src/PageMgr.cpp | 2 | ||||
| -rw-r--r-- | src/kernel/src/UserProcessScheduler.cpp | 7 |
5 files changed, 12 insertions, 15 deletions
diff --git a/src/kernel/KernelKit/BinaryMutex.h b/src/kernel/KernelKit/BinaryMutex.h index d97ab854..2388c50a 100644 --- a/src/kernel/KernelKit/BinaryMutex.h +++ b/src/kernel/KernelKit/BinaryMutex.h @@ -7,8 +7,8 @@ #define KERNELKIT_BINARYMUTEX_H #include <CompilerKit/CompilerKit.h> -#include <KernelKit/Timer.h> #include <KernelKit/CoreProcessScheduler.h> +#include <KernelKit/Timer.h> #include <NeKit/Config.h> namespace Kernel { @@ -38,7 +38,7 @@ class BinaryMutex final { NE_COPY_DEFAULT(BinaryMutex) private: - LockedPtr fLockingProcess{nullptr}; + LockedPtr fLockingProcess{nullptr}; AffinityKind fOwnerOriginalAffinity{AffinityKind::kInvalid}; // for priority inheritance }; } // namespace Kernel diff --git a/src/kernel/KernelKit/CoreProcessScheduler.h b/src/kernel/KernelKit/CoreProcessScheduler.h index 2f105036..5d6dc9b3 100644 --- a/src/kernel/KernelKit/CoreProcessScheduler.h +++ b/src/kernel/KernelKit/CoreProcessScheduler.h @@ -146,7 +146,7 @@ enum struct ProcessStatusKind : Int32 { /***********************************************************************************/ enum struct AffinityKind : Int32 { kInvalid = 0, - kUltraHigh = 100, + kUltraHigh = 100, kVeryHigh = 150, kHigh = 200, kStandard = 1000, diff --git a/src/kernel/src/BinaryMutex.cpp b/src/kernel/src/BinaryMutex.cpp index a83f031a..eb559f98 100644 --- a/src/kernel/src/BinaryMutex.cpp +++ b/src/kernel/src/BinaryMutex.cpp @@ -9,13 +9,12 @@ namespace Kernel { Bool BinaryMutex::Unlock() { - if (!fLockingProcess) - return No; + if (!fLockingProcess) return No; // restore original priority if we boosted the owner if (fOwnerOriginalAffinity != AffinityKind::kInvalid) { fLockingProcess->Affinity = fOwnerOriginalAffinity; - fOwnerOriginalAffinity = AffinityKind::kInvalid; + fOwnerOriginalAffinity = AffinityKind::kInvalid; } fLockingProcess = nullptr; @@ -33,13 +32,13 @@ Bool BinaryMutex::Lock(BinaryMutex::LockedPtr process) { if (this->IsLocked() && fLockingProcess) { // boost owner to waiter's priority if waiter is higher priority (lower value = higher priority) if (process->Affinity < fLockingProcess->Affinity) { - fOwnerOriginalAffinity = fLockingProcess->Affinity; + fOwnerOriginalAffinity = fLockingProcess->Affinity; fLockingProcess->Affinity = process->Affinity; } return No; // lock not acquired, but owner boosted } - this->fLockingProcess = process; + this->fLockingProcess = process; fOwnerOriginalAffinity = AffinityKind::kInvalid; return Yes; @@ -61,8 +60,7 @@ Bool BinaryMutex::LockAndWait(BinaryMutex::LockedPtr process, ITimer* timer) { if (timer == nullptr || !process) return No; // try to acquire lock immediately - if (this->Lock(process)) - return Yes; + if (this->Lock(process)) return Yes; // wait and retry timer->Wait(); diff --git a/src/kernel/src/PageMgr.cpp b/src/kernel/src/PageMgr.cpp index f0a8b346..0ed16767 100644 --- a/src/kernel/src/PageMgr.cpp +++ b/src/kernel/src/PageMgr.cpp @@ -13,7 +13,7 @@ #endif // ifdef __NE_AMD64__ || defined(__NE_ARM64__) namespace Kernel { - + PTEWrapper::PTEWrapper(Boolean Rw, Boolean User, Boolean ExecDisable, UIntPtr VirtAddr) : fRw(Rw), fUser(User), diff --git a/src/kernel/src/UserProcessScheduler.cpp b/src/kernel/src/UserProcessScheduler.cpp index a4b328ac..a8ef1799 100644 --- a/src/kernel/src/UserProcessScheduler.cpp +++ b/src/kernel/src/UserProcessScheduler.cpp @@ -477,7 +477,7 @@ Bool UserProcessScheduler::HasMP() { SizeT UserProcessScheduler::Run() { STATIC SizeT process_index{}; //! we store this guy to tell the scheduler how many - //! things we have scheduled. + //! things we have scheduled. UserProcessTeam& team = mTeam; SizeT limit = team.AsArray().Capacity(); @@ -506,8 +506,7 @@ SizeT UserProcessScheduler::Run() { if (process.STime > 0) { // the longer it slept, the bigger the boost (capped at kVeryHigh level) ProcessTime boost = process.STime / 10; - if (boost > (Int32)AffinityKind::kHigh) - boost = (Int32)AffinityKind::kHigh; + if (boost > (Int32) AffinityKind::kHigh) boost = (Int32) AffinityKind::kHigh; process.PTime += boost; process.STime = 0; // reset sleep counter after boost } @@ -527,7 +526,7 @@ SizeT UserProcessScheduler::Run() { process.PTime -= process.RTime; process.RTime = 0UL; } else if (AffinityKind::kUltraHigh != process.Affinity) { - process.PTime += (Int32)AffinityKind::kUltraHigh; + process.PTime += (Int32) AffinityKind::kUltraHigh; } } } else { |