From aeadbfa790b11ba859605df8a9357b960084b2a0 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 15 Oct 2018 08:53:01 -0400 Subject: 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. --- src/core/core_cpu.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/core/core_cpu.cpp') diff --git a/src/core/core_cpu.cpp b/src/core/core_cpu.cpp index 928262c9b..9f856ca6e 100644 --- a/src/core/core_cpu.cpp +++ b/src/core/core_cpu.cpp @@ -49,8 +49,7 @@ bool CpuBarrier::Rendezvous() { return false; } -Cpu::Cpu(std::shared_ptr exclusive_monitor, CpuBarrier& cpu_barrier, - std::size_t core_index) +Cpu::Cpu(ExclusiveMonitor& exclusive_monitor, CpuBarrier& cpu_barrier, std::size_t core_index) : cpu_barrier{cpu_barrier}, core_index{core_index} { if (Settings::values.use_cpu_jit) { #ifdef ARCHITECTURE_x86_64 @@ -68,10 +67,10 @@ Cpu::Cpu(std::shared_ptr exclusive_monitor, CpuBarrier& cpu_ba Cpu::~Cpu() = default; -std::shared_ptr Cpu::MakeExclusiveMonitor(std::size_t num_cores) { +std::unique_ptr Cpu::MakeExclusiveMonitor(std::size_t num_cores) { if (Settings::values.use_cpu_jit) { #ifdef ARCHITECTURE_x86_64 - return std::make_shared(num_cores); + return std::make_unique(num_cores); #else return nullptr; // TODO(merry): Passthrough exclusive monitor #endif -- cgit v1.2.3