diff options
Diffstat (limited to 'src/core/hle/kernel/kernel.h')
| -rw-r--r-- | src/core/hle/kernel/kernel.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/core/hle/kernel/kernel.h b/src/core/hle/kernel/kernel.h index c4397fc77..c74b9078f 100644 --- a/src/core/hle/kernel/kernel.h +++ b/src/core/hle/kernel/kernel.h | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | 6 | ||
| 7 | #include <string> | 7 | #include <string> |
| 8 | #include <unordered_map> | 8 | #include <unordered_map> |
| 9 | #include <vector> | ||
| 9 | #include "core/hle/kernel/object.h" | 10 | #include "core/hle/kernel/object.h" |
| 10 | 11 | ||
| 11 | namespace Core { | 12 | namespace Core { |
| @@ -30,7 +31,7 @@ class Thread; | |||
| 30 | /// Represents a single instance of the kernel. | 31 | /// Represents a single instance of the kernel. |
| 31 | class KernelCore { | 32 | class KernelCore { |
| 32 | private: | 33 | private: |
| 33 | using NamedPortTable = std::unordered_map<std::string, SharedPtr<ClientPort>>; | 34 | using NamedPortTable = std::unordered_map<std::string, std::shared_ptr<ClientPort>>; |
| 34 | 35 | ||
| 35 | public: | 36 | public: |
| 36 | /// Constructs an instance of the kernel using the given System | 37 | /// Constructs an instance of the kernel using the given System |
| @@ -56,13 +57,13 @@ public: | |||
| 56 | void Shutdown(); | 57 | void Shutdown(); |
| 57 | 58 | ||
| 58 | /// Retrieves a shared pointer to the system resource limit instance. | 59 | /// Retrieves a shared pointer to the system resource limit instance. |
| 59 | SharedPtr<ResourceLimit> GetSystemResourceLimit() const; | 60 | std::shared_ptr<ResourceLimit> GetSystemResourceLimit() const; |
| 60 | 61 | ||
| 61 | /// Retrieves a shared pointer to a Thread instance within the thread wakeup handle table. | 62 | /// Retrieves a shared pointer to a Thread instance within the thread wakeup handle table. |
| 62 | SharedPtr<Thread> RetrieveThreadFromWakeupCallbackHandleTable(Handle handle) const; | 63 | std::shared_ptr<Thread> RetrieveThreadFromWakeupCallbackHandleTable(Handle handle) const; |
| 63 | 64 | ||
| 64 | /// Adds the given shared pointer to an internal list of active processes. | 65 | /// Adds the given shared pointer to an internal list of active processes. |
| 65 | void AppendNewProcess(SharedPtr<Process> process); | 66 | void AppendNewProcess(std::shared_ptr<Process> process); |
| 66 | 67 | ||
| 67 | /// Makes the given process the new current process. | 68 | /// Makes the given process the new current process. |
| 68 | void MakeCurrentProcess(Process* process); | 69 | void MakeCurrentProcess(Process* process); |
| @@ -74,7 +75,7 @@ public: | |||
| 74 | const Process* CurrentProcess() const; | 75 | const Process* CurrentProcess() const; |
| 75 | 76 | ||
| 76 | /// Retrieves the list of processes. | 77 | /// Retrieves the list of processes. |
| 77 | const std::vector<SharedPtr<Process>>& GetProcessList() const; | 78 | const std::vector<std::shared_ptr<Process>>& GetProcessList() const; |
| 78 | 79 | ||
| 79 | /// Gets the sole instance of the global scheduler | 80 | /// Gets the sole instance of the global scheduler |
| 80 | Kernel::GlobalScheduler& GlobalScheduler(); | 81 | Kernel::GlobalScheduler& GlobalScheduler(); |
| @@ -83,7 +84,7 @@ public: | |||
| 83 | const Kernel::GlobalScheduler& GlobalScheduler() const; | 84 | const Kernel::GlobalScheduler& GlobalScheduler() const; |
| 84 | 85 | ||
| 85 | /// Adds a port to the named port table | 86 | /// Adds a port to the named port table |
| 86 | void AddNamedPort(std::string name, SharedPtr<ClientPort> port); | 87 | void AddNamedPort(std::string name, std::shared_ptr<ClientPort> port); |
| 87 | 88 | ||
| 88 | /// Finds a port within the named port table with the given name. | 89 | /// Finds a port within the named port table with the given name. |
| 89 | NamedPortTable::iterator FindNamedPort(const std::string& name); | 90 | NamedPortTable::iterator FindNamedPort(const std::string& name); |