mirrors/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere.git synced 2025-02-10 10:45:16 +00:00
Code Issues Releases Activity

Fix KCondition variable; add timeout parameter to ILimitableResource

Browse source
This commit is contained in:
TuxSH 2018-11-05 23:16:35 +01:00 • committed by Michael Scire
parent 0a0c05481e
commit e2d8316401
4 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
mesosphere/include/mesosphere/interfaces/ILimitedResource.hpp
View file

@ -15,10 +15,12 @@ void ReleaseResource(const SharedPtr<KResourceLimit> &reslimit, KAutoObject::Typ
}
template<typename Derived>
template<typename Derived, uint maxResourceAcqWaitTimeMsec = 1000u>
class ILimitedResource {
public:
static constexpr auto maxResourceAcqWaitTime = maxResourceAcqWaitTimeMsec * 1ms;
const SharedPtr<KProcess>& GetResourceOwner() const { return resourceOwner; }
void SetResourceOwner(SharedPtr<KProcess> owner)
{

2
mesosphere/include/mesosphere/threading/KThread.hpp
View file

@ -22,7 +22,7 @@ using ThreadMutexWaitListBaseHook = boost::intrusive::list_base_hook<boost::int
class KThread final :
public KAutoObject,
public ILimitedResource<KThread>,
public ILimitedResource<KThread, 100u>,
public ISetAllocated<KThread>,
public IAlarmable,
public ThreadWaitListBaseHook,

2
mesosphere/source/kresources/KResourceLimit.cpp
View file

@ -64,8 +64,6 @@ bool KResourceLimit::ReserveDetail(KResourceLimit::Category category, size_t cou
};
if (timeoutTime <= KSystemClock::never) {
// TODO, check is actually < 0
// TODO timeout
ok = true;
condvar.wait(condition);
} else {

13
mesosphere/source/threading/KConditionVariable.cpp
View file

@ -8,16 +8,19 @@ namespace mesosphere
void KConditionVariable::wait_until_impl(const KSystemClock::time_point &timeoutPoint) noexcept
{
// Official kernel counts number of waiters, but that isn't necessary
bool hasWaited = false;
KThread *currentThread = KCoreContext::GetCurrentInstance().GetCurrentThread();
{
KThread *currentThread = KCoreContext::GetCurrentInstance().GetCurrentThread();
KScopedCriticalSection criticalSection{};
mutex_.unlock();
if (currentThread->WaitForKernelSync(waiterList)) {
(void)timeoutPoint; //TODO!
} else {
// Termination
if (currentThread->WaitForKernelSync(waiterList) && timeoutPoint > KSystemClock::time_point{}) {
hasWaited = true;
currentThread->SetAlarmTime(timeoutPoint);
}
}
if (hasWaited) {
currentThread->ClearAlarm();
}
mutex_.lock();
}