mirror of
https://git.h3cjp.net/H3cJP/citra.git
synced 2024-12-28 14:16:57 +00:00
Address issues
This commit is contained in:
parent
ee333e063d
commit
9e4b2d60bc
|
@ -17,44 +17,41 @@ namespace Kernel {
|
||||||
class KernelCore;
|
class KernelCore;
|
||||||
|
|
||||||
class KLightConditionVariable {
|
class KLightConditionVariable {
|
||||||
private:
|
|
||||||
KThreadQueue m_thread_queue;
|
|
||||||
|
|
||||||
public:
|
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);
|
WaitImpl(lock, timeout);
|
||||||
lock->Lock();
|
lock->Lock();
|
||||||
}
|
}
|
||||||
|
|
||||||
void Broadcast() {
|
void Broadcast() {
|
||||||
KScopedSchedulerLock lk{kernel};
|
KScopedSchedulerLock lk{kernel};
|
||||||
while (m_thread_queue.WakeupFrontThread() != nullptr) {
|
while (thread_queue.WakeupFrontThread() != nullptr) {
|
||||||
/* We want to signal all threads, and so should continue waking up until there's nothing
|
// We want to signal all threads, and so should continue waking up until there's nothing
|
||||||
* to wake. */
|
// to wake.
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void WaitImpl(KLightLock* lock, s64 timeout) {
|
void WaitImpl(KLightLock* lock, s64 timeout) {
|
||||||
KThread* owner = GetCurrentThreadPointer(kernel);
|
KThread* owner = GetCurrentThreadPointer(kernel);
|
||||||
// KHardwareTimer* timer;
|
|
||||||
|
|
||||||
/* Sleep the thread. */
|
// Sleep the thread.
|
||||||
{
|
{
|
||||||
KScopedSchedulerLockAndSleep lk(kernel, owner, timeout);
|
KScopedSchedulerLockAndSleep lk(kernel, owner, timeout);
|
||||||
lock->Unlock();
|
lock->Unlock();
|
||||||
|
|
||||||
if (!m_thread_queue.SleepThread(owner)) {
|
if (!thread_queue.SleepThread(owner)) {
|
||||||
lk.CancelSleep();
|
lk.CancelSleep();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Cancel the task that the sleep setup. */
|
// Cancel the task that the sleep setup.
|
||||||
kernel.TimeManager().UnscheduleTimeEvent(owner);
|
kernel.TimeManager().UnscheduleTimeEvent(owner);
|
||||||
}
|
}
|
||||||
KernelCore& kernel;
|
KernelCore& kernel;
|
||||||
|
KThreadQueue thread_queue;
|
||||||
};
|
};
|
||||||
} // namespace Kernel
|
} // namespace Kernel
|
||||||
|
|
|
@ -13,9 +13,7 @@
|
||||||
#include "core/hle/kernel/svc_results.h"
|
#include "core/hle/kernel/svc_results.h"
|
||||||
|
|
||||||
namespace Kernel {
|
namespace Kernel {
|
||||||
namespace {
|
|
||||||
constexpr s64 DefaultTimeout = 10000000000; // 10 seconds
|
constexpr s64 DefaultTimeout = 10000000000; // 10 seconds
|
||||||
}
|
|
||||||
|
|
||||||
KResourceLimit::KResourceLimit(KernelCore& kernel, Core::System& system)
|
KResourceLimit::KResourceLimit(KernelCore& kernel, Core::System& system)
|
||||||
: Object{kernel}, lock{kernel}, cond_var{kernel}, kernel{kernel}, system(system) {}
|
: Object{kernel}, lock{kernel}, cond_var{kernel}, kernel{kernel}, system(system) {}
|
||||||
|
|
|
@ -37,7 +37,7 @@ constexpr bool IsValidResourceType(LimitableResource type) {
|
||||||
|
|
||||||
class KResourceLimit final : public Object {
|
class KResourceLimit final : public Object {
|
||||||
public:
|
public:
|
||||||
KResourceLimit(KernelCore& kernel, Core::System& system);
|
explicit KResourceLimit(KernelCore& kernel, Core::System& system);
|
||||||
~KResourceLimit();
|
~KResourceLimit();
|
||||||
|
|
||||||
s64 GetLimitValue(LimitableResource which) const;
|
s64 GetLimitValue(LimitableResource which) const;
|
||||||
|
@ -67,10 +67,11 @@ public:
|
||||||
virtual void Finalize() override {}
|
virtual void Finalize() override {}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
std::array<s64, static_cast<std::size_t>(LimitableResource::Count)> limit_values{};
|
using ResourceArray = std::array<s64, static_cast<std::size_t>(LimitableResource::Count)>;
|
||||||
std::array<s64, static_cast<std::size_t>(LimitableResource::Count)> current_values{};
|
ResourceArray limit_values{};
|
||||||
std::array<s64, static_cast<std::size_t>(LimitableResource::Count)> current_hints{};
|
ResourceArray current_values{};
|
||||||
std::array<s64, static_cast<std::size_t>(LimitableResource::Count)> peak_values{};
|
ResourceArray current_hints{};
|
||||||
|
ResourceArray peak_values{};
|
||||||
mutable KLightLock lock;
|
mutable KLightLock lock;
|
||||||
s32 waiter_count{};
|
s32 waiter_count{};
|
||||||
KLightConditionVariable cond_var;
|
KLightConditionVariable cond_var;
|
||||||
|
|
Loading…
Reference in a new issue