diff options
| author | Lioncash <mathew1800@gmail.com> | 2018-10-15 08:53:01 -0400 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2018-10-15 14:15:50 -0400 |
| commit | aeadbfa790b11ba859605df8a9357b960084b2a0 (patch) | |
| tree | eb46f94603e38f81ccf443024357ad567d5ef15b /src/core/core.cpp | |
| parent | c34efbbd60a41afbbab2ff17bbff999519cfb4b6 (diff) | |
core: Make the exclusive monitor a unique_ptr instead of a shared_ptr
Like the barrier, this is owned entirely by the System and will always
outlive the encompassing state, so shared ownership semantics aren't
necessary here.
Diffstat (limited to 'src/core/core.cpp')
| -rw-r--r-- | src/core/core.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp index 1b9b1f608f..876469ee3d 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -142,7 +142,7 @@ struct System::Impl { cpu_barrier = std::make_unique<CpuBarrier>(); cpu_exclusive_monitor = Cpu::MakeExclusiveMonitor(cpu_cores.size()); for (std::size_t index = 0; index < cpu_cores.size(); ++index) { - cpu_cores[index] = std::make_shared<Cpu>(cpu_exclusive_monitor, *cpu_barrier, index); + cpu_cores[index] = std::make_shared<Cpu>(*cpu_exclusive_monitor, *cpu_barrier, index); } telemetry_session = std::make_unique<Core::TelemetrySession>(); @@ -245,6 +245,7 @@ struct System::Impl { for (auto& cpu_core : cpu_cores) { cpu_core.reset(); } + cpu_exclusive_monitor.reset(); cpu_barrier.reset(); // Shutdown kernel and core timing @@ -282,7 +283,7 @@ struct System::Impl { std::unique_ptr<VideoCore::RendererBase> renderer; std::unique_ptr<Tegra::GPU> gpu_core; std::shared_ptr<Tegra::DebugContext> debug_context; - std::shared_ptr<ExclusiveMonitor> cpu_exclusive_monitor; + std::unique_ptr<ExclusiveMonitor> cpu_exclusive_monitor; std::unique_ptr<CpuBarrier> cpu_barrier; std::array<std::shared_ptr<Cpu>, NUM_CPU_CORES> cpu_cores; std::array<std::unique_ptr<std::thread>, NUM_CPU_CORES - 1> cpu_core_threads; |