Mon, 16 Dec 2019 17:46:05 +0100
8236008: Some backup files were accidentally left in the hotspot tree
Reviewed-by: phh
src/share/vm/jfr/jfr.cpp~ | file | annotate | diff | comparison | revisions | |
src/share/vm/jfr/jfr.hpp~ | file | annotate | diff | comparison | revisions |
1.1 --- a/src/share/vm/jfr/jfr.cpp~ Tue Oct 22 20:55:30 2019 +0800 1.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 1.3 @@ -1,97 +0,0 @@ 1.4 -/* 1.5 - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. 1.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 1.7 - * 1.8 - * This code is free software; you can redistribute it and/or modify it 1.9 - * under the terms of the GNU General Public License version 2 only, as 1.10 - * published by the Free Software Foundation. 1.11 - * 1.12 - * This code is distributed in the hope that it will be useful, but WITHOUT 1.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 1.14 - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 1.15 - * version 2 for more details (a copy is included in the LICENSE file that 1.16 - * accompanied this code). 1.17 - * 1.18 - * You should have received a copy of the GNU General Public License version 1.19 - * 2 along with this work; if not, write to the Free Software Foundation, 1.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 1.21 - * 1.22 - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 1.23 - * or visit www.oracle.com if you need additional information or have any 1.24 - * questions. 1.25 - * 1.26 - */ 1.27 - 1.28 -#include "precompiled.hpp" 1.29 -#include "jfr/jfr.hpp" 1.30 -#include "jfr/leakprofiler/leakProfiler.hpp" 1.31 -#include "jfr/periodic/sampling/jfrThreadSampler.hpp" 1.32 -#include "jfr/recorder/jfrRecorder.hpp" 1.33 -#include "jfr/recorder/checkpoint/jfrCheckpointManager.hpp" 1.34 -#include "jfr/recorder/repository/jfrEmergencyDump.hpp" 1.35 -#include "jfr/recorder/service/jfrOptionSet.hpp" 1.36 -#include "jfr/support/jfrThreadLocal.hpp" 1.37 -#include "runtime/java.hpp" 1.38 - 1.39 -bool Jfr::is_enabled() { 1.40 - return JfrRecorder::is_enabled(); 1.41 -} 1.42 - 1.43 -bool Jfr::is_disabled() { 1.44 - return JfrRecorder::is_disabled(); 1.45 -} 1.46 - 1.47 -bool Jfr::is_recording() { 1.48 - return JfrRecorder::is_recording(); 1.49 -} 1.50 - 1.51 -void Jfr::on_vm_init() { 1.52 - if (!JfrRecorder::on_vm_init()) { 1.53 - vm_exit_during_initialization("Failure when starting JFR on_vm_init"); 1.54 - } 1.55 -} 1.56 - 1.57 -void Jfr::on_vm_start() { 1.58 - if (!JfrRecorder::on_vm_start()) { 1.59 - vm_exit_during_initialization("Failure when starting JFR on_vm_start"); 1.60 - } 1.61 -} 1.62 - 1.63 -void Jfr::on_unloading_classes() { 1.64 - if (JfrRecorder::is_created()) { 1.65 - JfrCheckpointManager::write_type_set_for_unloaded_classes(); 1.66 - } 1.67 -} 1.68 - 1.69 -void Jfr::on_thread_exit(JavaThread* thread) { 1.70 - JfrThreadLocal::on_exit(thread); 1.71 -} 1.72 - 1.73 -void Jfr::on_thread_destruct(Thread* thread) { 1.74 - if (JfrRecorder::is_created()) { 1.75 - JfrThreadLocal::on_destruct(thread); 1.76 - } 1.77 -} 1.78 - 1.79 -void Jfr::on_vm_shutdown(bool exception_handler) { 1.80 - JfrRecorder::set_is_shutting_down(); 1.81 - if (JfrRecorder::is_recording()) { 1.82 - JfrEmergencyDump::on_vm_shutdown(exception_handler); 1.83 - } 1.84 -} 1.85 - 1.86 -void Jfr::weak_oops_do(BoolObjectClosure* is_alive, OopClosure* f) { 1.87 - LeakProfiler::oops_do(is_alive, f); 1.88 -} 1.89 - 1.90 -bool Jfr::on_flight_recorder_option(const JavaVMOption** option, char* delimiter) { 1.91 - return JfrOptionSet::parse_flight_recorder_option(option, delimiter); 1.92 -} 1.93 - 1.94 -bool Jfr::on_start_flight_recording_option(const JavaVMOption** option, char* delimiter) { 1.95 - return JfrOptionSet::parse_start_flight_recording_option(option, delimiter); 1.96 -} 1.97 - 1.98 -Thread* Jfr::sampler_thread() { 1.99 - return JfrThreadSampling::sampler_thread(); 1.100 -}
2.1 --- a/src/share/vm/jfr/jfr.hpp~ Tue Oct 22 20:55:30 2019 +0800 2.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 2.3 @@ -1,58 +0,0 @@ 2.4 -/* 2.5 - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. 2.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 2.7 - * 2.8 - * This code is free software; you can redistribute it and/or modify it 2.9 - * under the terms of the GNU General Public License version 2 only, as 2.10 - * published by the Free Software Foundation. 2.11 - * 2.12 - * This code is distributed in the hope that it will be useful, but WITHOUT 2.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 2.14 - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 2.15 - * version 2 for more details (a copy is included in the LICENSE file that 2.16 - * accompanied this code). 2.17 - * 2.18 - * You should have received a copy of the GNU General Public License version 2.19 - * 2 along with this work; if not, write to the Free Software Foundation, 2.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 2.21 - * 2.22 - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 2.23 - * or visit www.oracle.com if you need additional information or have any 2.24 - * questions. 2.25 - * 2.26 - */ 2.27 - 2.28 -#ifndef SHARE_VM_JFR_JFR_HPP 2.29 -#define SHARE_VM_JFR_JFR_HPP 2.30 - 2.31 -#include "jni.h" 2.32 -#include "memory/allocation.hpp" 2.33 - 2.34 -class BoolObjectClosure; 2.35 -class JavaThread; 2.36 -class OopClosure; 2.37 -class Thread; 2.38 - 2.39 -extern "C" void JNICALL jfr_register_natives(JNIEnv*, jclass); 2.40 - 2.41 -// 2.42 -// The VM interface to Flight Recorder. 2.43 -// 2.44 -class Jfr : AllStatic { 2.45 - public: 2.46 - static bool is_enabled(); 2.47 - static bool is_disabled(); 2.48 - static bool is_recording(); 2.49 - static void on_vm_init(); 2.50 - static void on_vm_start(); 2.51 - static void on_unloading_classes(); 2.52 - static void on_thread_exit(JavaThread* thread); 2.53 - static void on_thread_destruct(Thread* thread); 2.54 - static void on_vm_shutdown(bool exception_handler = false); 2.55 - static bool on_flight_recorder_option(const JavaVMOption** option, char* delimiter); 2.56 - static bool on_start_flight_recording_option(const JavaVMOption** option, char* delimiter); 2.57 - static void weak_oops_do(BoolObjectClosure* is_alive, OopClosure* f); 2.58 - static Thread* sampler_thread(); 2.59 -}; 2.60 - 2.61 -#endif // SHARE_VM_JFR_JFR_HPP