Downloafy/suyu-forked
1
0
Fork 1
forked from suyu/suyu
Code Pull requests 1 Activity

Address issues

Browse source
This commit is contained in:
Chloe Marcec 2021-02-02 13:23:00 +11:00
parent ee333e063d
commit 9e4b2d60bc
3 changed files with 15 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/core/hle/kernel/k_light_condition_variable.h
View file

@ -17,44 +17,41 @@ namespace Kernel {
class KernelCore;
class KLightConditionVariable {
private:
KThreadQueue m_thread_queue;
public:
KLightConditionVariable(KernelCore& kernel) : m_thread_queue(kernel), kernel(kernel) {}
explicit KLightConditionVariable(KernelCore& kernel) : thread_queue(kernel), kernel(kernel) {}
void Wait(KLightLock* lock, s64 timeout = -1ll) {
void Wait(KLightLock* lock, s64 timeout = -1) {
WaitImpl(lock, timeout);
lock->Lock();
}
void Broadcast() {
KScopedSchedulerLock lk{kernel};
while (m_thread_queue.WakeupFrontThread() != nullptr) {
/* We want to signal all threads, and so should continue waking up until there's nothing
* to wake. */
while (thread_queue.WakeupFrontThread() != nullptr) {
// We want to signal all threads, and so should continue waking up until there's nothing
// to wake.
}
}
private:
void WaitImpl(KLightLock* lock, s64 timeout) {
KThread* owner = GetCurrentThreadPointer(kernel);
// KHardwareTimer* timer;
/* Sleep the thread. */
// Sleep the thread.
{
KScopedSchedulerLockAndSleep lk(kernel, owner, timeout);
lock->Unlock();
if (!m_thread_queue.SleepThread(owner)) {
if (!thread_queue.SleepThread(owner)) {
lk.CancelSleep();
return;
}
}
/* Cancel the task that the sleep setup. */
// Cancel the task that the sleep setup.
kernel.TimeManager().UnscheduleTimeEvent(owner);
}
KernelCore& kernel;
KThreadQueue thread_queue;
};
} // namespace Kernel

2
src/core/hle/kernel/k_resource_limit.cpp
View file

@ -13,9 +13,7 @@
#include "core/hle/kernel/svc_results.h"
namespace Kernel {
namespace {
constexpr s64 DefaultTimeout = 10000000000; // 10 seconds
}
KResourceLimit::KResourceLimit(KernelCore& kernel, Core::System& system)
: Object{kernel}, lock{kernel}, cond_var{kernel}, kernel{kernel}, system(system) {}

11
src/core/hle/kernel/k_resource_limit.h
View file

@ -37,7 +37,7 @@ constexpr bool IsValidResourceType(LimitableResource type) {
class KResourceLimit final : public Object {
public:
KResourceLimit(KernelCore& kernel, Core::System& system);
explicit KResourceLimit(KernelCore& kernel, Core::System& system);
~KResourceLimit();
s64 GetLimitValue(LimitableResource which) const;
@ -67,10 +67,11 @@ public:
virtual void Finalize() override {}
private:
std::array<s64, static_cast<std::size_t>(LimitableResource::Count)> limit_values{};
std::array<s64, static_cast<std::size_t>(LimitableResource::Count)> current_values{};
std::array<s64, static_cast<std::size_t>(LimitableResource::Count)> current_hints{};
std::array<s64, static_cast<std::size_t>(LimitableResource::Count)> peak_values{};
using ResourceArray = std::array<s64, static_cast<std::size_t>(LimitableResource::Count)>;
ResourceArray limit_values{};
ResourceArray current_values{};
ResourceArray current_hints{};
ResourceArray peak_values{};
mutable KLightLock lock;
s32 waiter_count{};
KLightConditionVariable cond_var;