diff options
Diffstat (limited to 'src/core/hle/kernel')
| -rw-r--r-- | src/core/hle/kernel/process.cpp | 32 | ||||
| -rw-r--r-- | src/core/hle/kernel/process.h | 13 |
2 files changed, 38 insertions, 7 deletions
diff --git a/src/core/hle/kernel/process.cpp b/src/core/hle/kernel/process.cpp index 35cf6dc95..8e74059ea 100644 --- a/src/core/hle/kernel/process.cpp +++ b/src/core/hle/kernel/process.cpp | |||
| @@ -2,6 +2,7 @@ | |||
| 2 | // Licensed under GPLv2 or any later version | 2 | // Licensed under GPLv2 or any later version |
| 3 | // Refer to the license.txt file included. | 3 | // Refer to the license.txt file included. |
| 4 | 4 | ||
| 5 | #include <algorithm> | ||
| 5 | #include <memory> | 6 | #include <memory> |
| 6 | #include "common/assert.h" | 7 | #include "common/assert.h" |
| 7 | #include "common/common_funcs.h" | 8 | #include "common/common_funcs.h" |
| @@ -16,6 +17,9 @@ | |||
| 16 | 17 | ||
| 17 | namespace Kernel { | 18 | namespace Kernel { |
| 18 | 19 | ||
| 20 | // Lists all processes that exist in the current session. | ||
| 21 | static std::vector<SharedPtr<Process>> process_list; | ||
| 22 | |||
| 19 | SharedPtr<CodeSet> CodeSet::Create(std::string name, u64 program_id) { | 23 | SharedPtr<CodeSet> CodeSet::Create(std::string name, u64 program_id) { |
| 20 | SharedPtr<CodeSet> codeset(new CodeSet); | 24 | SharedPtr<CodeSet> codeset(new CodeSet); |
| 21 | 25 | ||
| @@ -36,7 +40,9 @@ SharedPtr<Process> Process::Create(std::string&& name) { | |||
| 36 | process->name = std::move(name); | 40 | process->name = std::move(name); |
| 37 | process->flags.raw = 0; | 41 | process->flags.raw = 0; |
| 38 | process->flags.memory_region.Assign(MemoryRegion::APPLICATION); | 42 | process->flags.memory_region.Assign(MemoryRegion::APPLICATION); |
| 43 | process->status = ProcessStatus::Created; | ||
| 39 | 44 | ||
| 45 | process_list.push_back(process); | ||
| 40 | return process; | 46 | return process; |
| 41 | } | 47 | } |
| 42 | 48 | ||
| @@ -129,6 +135,7 @@ void Process::Run(VAddr entry_point, s32 main_thread_priority, u32 stack_size) { | |||
| 129 | } | 135 | } |
| 130 | 136 | ||
| 131 | vm_manager.LogLayout(Log::Level::Debug); | 137 | vm_manager.LogLayout(Log::Level::Debug); |
| 138 | status = ProcessStatus::Running; | ||
| 132 | 139 | ||
| 133 | Kernel::SetupMainThread(entry_point, main_thread_priority, this); | 140 | Kernel::SetupMainThread(entry_point, main_thread_priority, this); |
| 134 | } | 141 | } |
| @@ -137,11 +144,11 @@ void Process::LoadModule(SharedPtr<CodeSet> module_, VAddr base_addr) { | |||
| 137 | memory_region = GetMemoryRegion(flags.memory_region); | 144 | memory_region = GetMemoryRegion(flags.memory_region); |
| 138 | 145 | ||
| 139 | auto MapSegment = [&](CodeSet::Segment& segment, VMAPermission permissions, | 146 | auto MapSegment = [&](CodeSet::Segment& segment, VMAPermission permissions, |
| 140 | MemoryState memory_state) { | 147 | MemoryState memory_state) { |
| 141 | auto vma = vm_manager | 148 | auto vma = vm_manager |
| 142 | .MapMemoryBlock(segment.addr + base_addr, module_->memory, segment.offset, segment.size, | 149 | .MapMemoryBlock(segment.addr + base_addr, module_->memory, segment.offset, |
| 143 | memory_state) | 150 | segment.size, memory_state) |
| 144 | .Unwrap(); | 151 | .Unwrap(); |
| 145 | vm_manager.Reprotect(vma, permissions); | 152 | vm_manager.Reprotect(vma, permissions); |
| 146 | misc_memory_used += segment.size; | 153 | misc_memory_used += segment.size; |
| 147 | memory_region->used += segment.size; | 154 | memory_region->used += segment.size; |
| @@ -299,5 +306,20 @@ ResultCode Process::UnmapMemory(VAddr dst_addr, VAddr /*src_addr*/, u64 size) { | |||
| 299 | Kernel::Process::Process() {} | 306 | Kernel::Process::Process() {} |
| 300 | Kernel::Process::~Process() {} | 307 | Kernel::Process::~Process() {} |
| 301 | 308 | ||
| 302 | SharedPtr<Process> g_current_process; | 309 | void ClearProcessList() { |
| 310 | process_list.clear(); | ||
| 311 | } | ||
| 312 | |||
| 313 | SharedPtr<Process> GetProcessById(u32 process_id) { | ||
| 314 | auto itr = std::find_if( | ||
| 315 | process_list.begin(), process_list.end(), | ||
| 316 | [&](const SharedPtr<Process>& process) { return process->process_id == process_id; }); | ||
| 317 | |||
| 318 | if (itr == process_list.end()) | ||
| 319 | return nullptr; | ||
| 320 | |||
| 321 | return *itr; | ||
| 303 | } | 322 | } |
| 323 | |||
| 324 | SharedPtr<Process> g_current_process; | ||
| 325 | } // namespace Kernel | ||
diff --git a/src/core/hle/kernel/process.h b/src/core/hle/kernel/process.h index 3ea8c298f..305275387 100644 --- a/src/core/hle/kernel/process.h +++ b/src/core/hle/kernel/process.h | |||
| @@ -8,6 +8,7 @@ | |||
| 8 | #include <cstddef> | 8 | #include <cstddef> |
| 9 | #include <memory> | 9 | #include <memory> |
| 10 | #include <string> | 10 | #include <string> |
| 11 | #include <vector> | ||
| 11 | #include <boost/container/static_vector.hpp> | 12 | #include <boost/container/static_vector.hpp> |
| 12 | #include "common/bit_field.h" | 13 | #include "common/bit_field.h" |
| 13 | #include "common/common_types.h" | 14 | #include "common/common_types.h" |
| @@ -48,6 +49,8 @@ union ProcessFlags { | |||
| 48 | BitField<12, 1, u16> loaded_high; ///< Application loaded high (not at 0x00100000). | 49 | BitField<12, 1, u16> loaded_high; ///< Application loaded high (not at 0x00100000). |
| 49 | }; | 50 | }; |
| 50 | 51 | ||
| 52 | enum class ProcessStatus { Created, Running, Exited }; | ||
| 53 | |||
| 51 | class ResourceLimit; | 54 | class ResourceLimit; |
| 52 | struct MemoryRegionInfo; | 55 | struct MemoryRegionInfo; |
| 53 | 56 | ||
| @@ -124,6 +127,8 @@ public: | |||
| 124 | u16 kernel_version = 0; | 127 | u16 kernel_version = 0; |
| 125 | /// The default CPU for this process, threads are scheduled on this cpu by default. | 128 | /// The default CPU for this process, threads are scheduled on this cpu by default. |
| 126 | u8 ideal_processor = 0; | 129 | u8 ideal_processor = 0; |
| 130 | /// Current status of the process | ||
| 131 | ProcessStatus status; | ||
| 127 | 132 | ||
| 128 | /// The id of this process | 133 | /// The id of this process |
| 129 | u32 process_id = next_process_id++; | 134 | u32 process_id = next_process_id++; |
| @@ -181,11 +186,15 @@ public: | |||
| 181 | 186 | ||
| 182 | ResultCode UnmapMemory(VAddr dst_addr, VAddr src_addr, u64 size); | 187 | ResultCode UnmapMemory(VAddr dst_addr, VAddr src_addr, u64 size); |
| 183 | 188 | ||
| 184 | |||
| 185 | private: | 189 | private: |
| 186 | Process(); | 190 | Process(); |
| 187 | ~Process() override; | 191 | ~Process() override; |
| 188 | }; | 192 | }; |
| 189 | 193 | ||
| 194 | void ClearProcessList(); | ||
| 195 | |||
| 196 | /// Retrieves a process from the current list of processes. | ||
| 197 | SharedPtr<Process> GetProcessById(u32 process_id); | ||
| 198 | |||
| 190 | extern SharedPtr<Process> g_current_process; | 199 | extern SharedPtr<Process> g_current_process; |
| 191 | } | 200 | } // namespace Kernel |