From 1a13240046d7675daba1581f2d9cb7b1f0b66be3 Mon Sep 17 00:00:00 2001 From: Brian Shirai Date: Fri, 1 May 2020 20:18:49 -0700 Subject: [PATCH] Clean up some ThreadNexus remnants. --- machine/class/thread.cpp | 2 +- machine/machine.hpp | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/machine/class/thread.cpp b/machine/class/thread.cpp index d0613caa3b..5567fe67a0 100644 --- a/machine/class/thread.cpp +++ b/machine/class/thread.cpp @@ -335,7 +335,7 @@ namespace rubinius { } if(state->lock_owned_p()) { - logger::write("thread: exiting while owning ThreadNexus lock: %s", + logger::write("thread: exiting while owning Threads lock: %s", state->name().c_str()); state->unlock(); } diff --git a/machine/machine.hpp b/machine/machine.hpp index ad1e154521..bd20d54837 100644 --- a/machine/machine.hpp +++ b/machine/machine.hpp @@ -26,7 +26,6 @@ namespace rubinius { class Diagnostic; } - class ThreadNexus; class Memory; namespace memory { @@ -148,7 +147,6 @@ namespace rubinius { MachineState* _machine_state_; ngLogger* _logger_; Threads* _threads_; - ThreadNexus* _thread_nexus_; Configuration* _configuration_; Environment* _environment_; Diagnostics* _diagnostics_; @@ -257,9 +255,6 @@ namespace rubinius { jit::MachineCompiler* start_compiler(STATE); - uint32_t new_thread_id(); - // --- - void halt_console(STATE); void halt_profiler(STATE); void halt_debugger(STATE); -- 2.11.4.GIT