# HG changeset patch # User sjohanss # Date 1519981744 -3600 # Node ID c3baee12070634553602f31e86bc54d07e804c36 # Parent 0e79ce03b7a20ae2d28cc40e79d6bce1ea0bc83b 8198432: Remove Thread extension point Reviewed-by: ehelin, dholmes, tschatzl diff -r 0e79ce03b7a2 -r c3baee120706 src/hotspot/share/runtime/thread.cpp --- a/src/hotspot/share/runtime/thread.cpp Fri Mar 02 10:09:02 2018 +0100 +++ b/src/hotspot/share/runtime/thread.cpp Fri Mar 02 10:09:04 2018 +0100 @@ -858,7 +858,6 @@ st->print("os_prio=%d ", os_prio); } st->print("tid=" INTPTR_FORMAT " ", p2i(this)); - ext().print_on(st); osthread()->print_on(st); } if (_threads_hazard_ptr != NULL) { @@ -3126,8 +3125,6 @@ // Push the Java priority down to the native thread; needs Threads_lock Thread::set_priority(this, prio); - prepare_ext(); - // Add the new thread to the Threads list and set it in motion. // We must have threads lock in order to call Threads::add. // It is crucial that we do not block before the thread is diff -r 0e79ce03b7a2 -r c3baee120706 src/hotspot/share/runtime/thread.hpp --- a/src/hotspot/share/runtime/thread.hpp Fri Mar 02 10:09:02 2018 +0100 +++ b/src/hotspot/share/runtime/thread.hpp Fri Mar 02 10:09:04 2018 +0100 @@ -41,7 +41,6 @@ #include "runtime/safepoint.hpp" #include "runtime/stubRoutines.hpp" #include "runtime/threadLocalStorage.hpp" -#include "runtime/thread_ext.hpp" #include "runtime/unhandledOops.hpp" #include "trace/traceBackend.hpp" #include "trace/traceMacros.hpp" @@ -326,8 +325,6 @@ mutable TRACE_DATA _trace_data; // Thread-local data for tracing - ThreadExt _ext; - int _vm_operation_started_count; // VM_Operation support int _vm_operation_completed_count; // VM_Operation support @@ -508,9 +505,6 @@ TRACE_DATA* trace_data() const { return &_trace_data; } bool is_trace_suspend() { return (_suspend_flags & _trace_flag) != 0; } - const ThreadExt& ext() const { return _ext; } - ThreadExt& ext() { return _ext; } - // VM operation support int vm_operation_ticket() { return ++_vm_operation_started_count; } int vm_operation_completed_count() { return _vm_operation_completed_count; } @@ -1137,7 +1131,6 @@ // not specified, use the priority of the thread object. Threads_lock // must be held while this function is called. void prepare(jobject jni_thread, ThreadPriority prio=NoPriority); - void prepare_ext(); void set_saved_exception_pc(address pc) { _saved_exception_pc = pc; } address saved_exception_pc() { return _saved_exception_pc; } diff -r 0e79ce03b7a2 -r c3baee120706 src/hotspot/share/runtime/thread_ext.cpp --- a/src/hotspot/share/runtime/thread_ext.cpp Fri Mar 02 10:09:02 2018 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,31 +0,0 @@ -/* - * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - * - */ - -#include "precompiled.hpp" -#include "runtime/thread.hpp" -#include "runtime/thread_ext.hpp" - -void JavaThread::prepare_ext() { -} - diff -r 0e79ce03b7a2 -r c3baee120706 src/hotspot/share/runtime/thread_ext.hpp --- a/src/hotspot/share/runtime/thread_ext.hpp Fri Mar 02 10:09:02 2018 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - * - */ - -#ifndef SHARE_VM_RUNTIME_THREAD_EXT_HPP -#define SHARE_VM_RUNTIME_THREAD_EXT_HPP - -#include "memory/allocation.hpp" - -class ThreadExt VALUE_OBJ_CLASS_SPEC { -public: - void print_on(outputStream* st) const {}; -}; - -#endif // SHARE_VM_RUNTIME_THREAD_EXT_HPP