summaryrefslogtreecommitdiff
path: root/src/core/hle/kernel/kernel.cpp
diff options
context:
space:
mode:
authorGravatar bunnei2015-05-15 09:42:36 -0400
committerGravatar bunnei2015-05-15 09:42:36 -0400
commitef8d0e9823e0ac61624002b89912e8995a3588e4 (patch)
treedfaee1cefb39e627bd90562c416d19fe6002209c /src/core/hle/kernel/kernel.cpp
parentMerge pull request #675 from jroweboy/windows-build-fixes (diff)
parentCore/ResourceLimits: Implemented the basic structure of ResourceLimits. (diff)
downloadyuzu-ef8d0e9823e0ac61624002b89912e8995a3588e4.tar.gz
yuzu-ef8d0e9823e0ac61624002b89912e8995a3588e4.tar.xz
yuzu-ef8d0e9823e0ac61624002b89912e8995a3588e4.zip
Merge pull request #761 from Subv/resource_limits
Core/ResourceLimits: Implemented the basic structure of ResourceLimits.
Diffstat (limited to 'src/core/hle/kernel/kernel.cpp')
-rw-r--r--src/core/hle/kernel/kernel.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp
index b5c98b249..726e4d2ff 100644
--- a/src/core/hle/kernel/kernel.cpp
+++ b/src/core/hle/kernel/kernel.cpp
@@ -10,6 +10,7 @@
10#include "core/arm/arm_interface.h" 10#include "core/arm/arm_interface.h"
11#include "core/core.h" 11#include "core/core.h"
12#include "core/hle/kernel/kernel.h" 12#include "core/hle/kernel/kernel.h"
13#include "core/hle/kernel/resource_limit.h"
13#include "core/hle/kernel/process.h" 14#include "core/hle/kernel/process.h"
14#include "core/hle/kernel/thread.h" 15#include "core/hle/kernel/thread.h"
15#include "core/hle/kernel/timer.h" 16#include "core/hle/kernel/timer.h"
@@ -134,6 +135,7 @@ void HandleTable::Clear() {
134 135
135/// Initialize the kernel 136/// Initialize the kernel
136void Init() { 137void Init() {
138 Kernel::ResourceLimitsInit();
137 Kernel::ThreadingInit(); 139 Kernel::ThreadingInit();
138 Kernel::TimersInit(); 140 Kernel::TimersInit();
139 141
@@ -147,6 +149,7 @@ void Init() {
147void Shutdown() { 149void Shutdown() {
148 Kernel::ThreadingShutdown(); 150 Kernel::ThreadingShutdown();
149 Kernel::TimersShutdown(); 151 Kernel::TimersShutdown();
152 Kernel::ResourceLimitsShutdown();
150 g_handle_table.Clear(); // Free all kernel objects 153 g_handle_table.Clear(); // Free all kernel objects
151 g_current_process = nullptr; 154 g_current_process = nullptr;
152} 155}