mirrors/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere.git synced 2024-12-18 00:12:03 +00:00
Code Issues Releases Activity

kern: perform rescheduling on dispatch re-enable (closes #1169)

Browse source
This commit is contained in:
Michael Scire 2020-10-13 23:07:51 -07:00
parent d52179c708
commit 2e7214b6fa
3 changed files with 32 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/libmesosphere/include/mesosphere/kern_k_scheduler.hpp
View file

@ -48,6 +48,7 @@ namespace ams::kern {
private: private:
friend class KScopedSchedulerLock; friend class KScopedSchedulerLock;
friend class KScopedSchedulerLockAndSleep; friend class KScopedSchedulerLockAndSleep;
friend class KScopedDisableDispatch;
private: private:
SchedulingState state; SchedulingState state;
bool is_active; bool is_active;
@ -161,8 +162,9 @@ namespace ams::kern {
} }
ALWAYS_INLINE void ScheduleOnInterrupt() { ALWAYS_INLINE void ScheduleOnInterrupt() {
KScopedDisableDispatch dd; GetCurrentThread().DisableDispatch();
this->Schedule(); this->Schedule();
GetCurrentThread().EnableDispatch();
} }
void RescheduleOtherCores(u64 cores_needing_scheduling); void RescheduleOtherCores(u64 cores_needing_scheduling);

15
libraries/libmesosphere/include/mesosphere/kern_k_thread.hpp
View file

@ -559,20 +559,7 @@ namespace ams::kern {
GetCurrentThread().DisableDispatch(); GetCurrentThread().DisableDispatch();
} }
ALWAYS_INLINE ~KScopedDisableDispatch() { ~KScopedDisableDispatch();
GetCurrentThread().EnableDispatch();
}
};
class KScopedEnableDispatch {
public:
explicit ALWAYS_INLINE KScopedEnableDispatch() {
GetCurrentThread().EnableDispatch();
}
ALWAYS_INLINE ~KScopedEnableDispatch() {
GetCurrentThread().DisableDispatch();
}
}; };
ALWAYS_INLINE KExceptionContext *GetExceptionContext(KThread *thread) { ALWAYS_INLINE KExceptionContext *GetExceptionContext(KThread *thread) {

28
libraries/libmesosphere/source/kern_k_scoped_disable_dispatch.cpp Normal file
View file

@ -0,0 +1,28 @@
/*
* Copyright (c) 2018-2020 Atmosphère-NX
*
* This program is free software; you can redistribute it and/or modify it
* under the terms and conditions of the GNU General Public License,
* version 2, as published by the Free Software Foundation.
*
* This program is distributed in the hope it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <mesosphere.hpp>
namespace ams::kern {
KScopedDisableDispatch::~KScopedDisableDispatch() {
if (GetCurrentThread().GetDisableDispatchCount() <= 1) {
Kernel::GetScheduler().RescheduleCurrentCore();
} else {
GetCurrentThread().EnableDispatch();
}
}
}