stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8264881: Remove the old development option MemProfiling

Browse Source 
Reviewed-by: dholmes, coleenp, shade
This commit is contained in:
Yi Yang 2021-04-09 06:23:12 +00:00 committed by Aleksey Shipilev
parent 951f277a71
commit 666fd62ee8
8 changed files with 0 additions and 201 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/hotspot/os/aix/os_aix.cpp
View File

@ -930,7 +930,6 @@ void os::free_thread(OSThread* osthread) {
// time support // time support
// Time since start-up in seconds to a fine granularity. // Time since start-up in seconds to a fine granularity.
// Used by VMSelfDestructTimer and the MemProfiler.
double os::elapsedTime() { double os::elapsedTime() {
return ((double)os::elapsed_counter()) / os::elapsed_frequency(); // nanosecond resolution return ((double)os::elapsed_counter()) / os::elapsed_frequency(); // nanosecond resolution
} }

2
src/hotspot/os/bsd/os_bsd.cpp
View File

@ -765,9 +765,7 @@ void os::free_thread(OSThread* osthread) {
// time support // time support
// Time since start-up in seconds to a fine granularity. // Time since start-up in seconds to a fine granularity.
// Used by VMSelfDestructTimer and the MemProfiler.
double os::elapsedTime() { double os::elapsedTime() {
return ((double)os::elapsed_counter()) / os::elapsed_frequency(); return ((double)os::elapsed_counter()) / os::elapsed_frequency();
} }

2
src/hotspot/os/linux/os_linux.cpp
View File

@ -1270,9 +1270,7 @@ void os::Linux::capture_initial_stack(size_t max_size) {
// time support // time support
// Time since start-up in seconds to a fine granularity. // Time since start-up in seconds to a fine granularity.
// Used by VMSelfDestructTimer and the MemProfiler.
double os::elapsedTime() { double os::elapsedTime() {
return ((double)os::elapsed_counter()) / os::elapsed_frequency(); // nanosecond resolution return ((double)os::elapsed_counter()) / os::elapsed_frequency(); // nanosecond resolution
} }

6
src/hotspot/share/runtime/globals.hpp
View File

@ -683,9 +683,6 @@ const intx ObjectAlignmentInBytes = 8;
product(bool, ClassUnloadingWithConcurrentMark, true, \ product(bool, ClassUnloadingWithConcurrentMark, true, \
"Do unloading of classes with a concurrent marking cycle") \ "Do unloading of classes with a concurrent marking cycle") \
\ \
develop(bool, MemProfiling, false, \
"Write memory usage profiling to log file") \
\
notproduct(bool, PrintSystemDictionaryAtExit, false, \ notproduct(bool, PrintSystemDictionaryAtExit, false, \
"Print the system dictionary at exit") \ "Print the system dictionary at exit") \
\ \
@ -1377,9 +1374,6 @@ const intx ObjectAlignmentInBytes = 8;
notproduct(intx, SweeperLogEntries, 1024, \ notproduct(intx, SweeperLogEntries, 1024, \
"Number of records in the ring buffer of sweeper activity") \ "Number of records in the ring buffer of sweeper activity") \
\ \
notproduct(intx, MemProfilingInterval, 500, \
"Time between each invocation of the MemProfiler") \
\
develop(intx, MallocCatchPtr, -1, \ develop(intx, MallocCatchPtr, -1, \
"Hit breakpoint when mallocing/freeing this pointer") \ "Hit breakpoint when mallocing/freeing this pointer") \
\ \

5
src/hotspot/share/runtime/java.cpp
View File

@ -64,7 +64,6 @@
#include "runtime/init.hpp" #include "runtime/init.hpp"
#include "runtime/interfaceSupport.inline.hpp" #include "runtime/interfaceSupport.inline.hpp"
#include "runtime/java.hpp" #include "runtime/java.hpp"
#include "runtime/memprofiler.hpp"
#include "runtime/sharedRuntime.hpp" #include "runtime/sharedRuntime.hpp"
#include "runtime/statSampler.hpp" #include "runtime/statSampler.hpp"
#include "runtime/stubRoutines.hpp" #include "runtime/stubRoutines.hpp"
@ -224,10 +223,6 @@ void print_bytecode_count() {
// General statistics printing (profiling ...) // General statistics printing (profiling ...)
void print_statistics() { void print_statistics() {
if (MemProfiling) {
MemProfiler::disengage();
}
if (CITime) { if (CITime) {
CompileBroker::print_times(); CompileBroker::print_times();
} }

136
src/hotspot/share/runtime/memprofiler.cpp
View File

@ -1,136 +0,0 @@
/*
* Copyright (c) 1998, 2021, 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 "classfile/classLoaderDataGraph.inline.hpp"
#include "code/codeCache.hpp"
#include "gc/shared/collectedHeap.inline.hpp"
#include "interpreter/oopMapCache.hpp"
#include "memory/resourceArea.hpp"
#include "memory/universe.hpp"
#include "runtime/handles.inline.hpp"
#include "runtime/jniHandles.hpp"
#include "runtime/memprofiler.hpp"
#include "runtime/mutexLocker.hpp"
#include "runtime/os.hpp"
#include "runtime/task.hpp"
#include "runtime/thread.inline.hpp"
#include "runtime/threadSMR.hpp"
#include "runtime/vmThread.hpp"
#ifndef PRODUCT
// --------------------------------------------------------
// MemProfilerTask
class MemProfilerTask : public PeriodicTask {
public:
MemProfilerTask(int interval_time) : PeriodicTask(interval_time) {}
void task();
};
void MemProfilerTask::task() {
MemProfiler::do_trace();
}
//----------------------------------------------------------
// Implementation of MemProfiler
MemProfilerTask* MemProfiler::_task = NULL;
FILE* MemProfiler::_log_fp = NULL;
bool MemProfiler::is_active() {
return _task != NULL;
}
void MemProfiler::engage() {
const char *log_name = "mprofile.log";
if (!is_active()) {
// Create log file
_log_fp = fopen(log_name , "w+");
if (_log_fp == NULL) {
fatal("MemProfiler: Cannot create log file: %s", log_name);
}
fprintf(_log_fp, "MemProfiler: sizes are in Kb, time is in seconds since startup\n\n");
fprintf(_log_fp, " time, #thr, #cls, heap, heap, perm, perm, code, hndls, rescs, oopmp\n");
fprintf(_log_fp, " used, total, used, total, total, total, total, total\n");
fprintf(_log_fp, "--------------------------------------------------------------------------\n");
_task = new MemProfilerTask(MemProfilingInterval);
_task->enroll();
}
}
void MemProfiler::disengage() {
if (!is_active()) return;
// Do one last trace at disengage time
do_trace();
// Close logfile
fprintf(_log_fp, "MemProfiler detached\n");
fclose(_log_fp);
// remove MemProfilerTask
assert(_task != NULL, "sanity check");
_task->disenroll();
delete _task;
_task = NULL;
}
void MemProfiler::do_trace() {
// Calculate thread local sizes
size_t handles_memory_usage = VMThread::vm_thread()->handle_area()->size_in_bytes();
size_t resource_memory_usage = VMThread::vm_thread()->resource_area()->size_in_bytes();
{
JavaThreadIteratorWithHandle jtiwh;
for (; JavaThread *cur = jtiwh.next(); ) {
handles_memory_usage += cur->handle_area()->size_in_bytes();
resource_memory_usage += cur->resource_area()->size_in_bytes();
}
// Print trace line in log
fprintf(_log_fp, "%6.1f,%5d," SIZE_FORMAT_W(5) "," UINTX_FORMAT_W(6) "," UINTX_FORMAT_W(6) ",",
os::elapsedTime(),
jtiwh.length(),
ClassLoaderDataGraph::num_instance_classes(),
Universe::heap()->used() / K,
Universe::heap()->capacity() / K);
}
fprintf(_log_fp, UINTX_FORMAT_W(6) ",", CodeCache::capacity() / K);
fprintf(_log_fp, UINTX_FORMAT_W(6) "," UINTX_FORMAT_W(6) ",%6ld\n",
handles_memory_usage / K,
resource_memory_usage / K,
0L);
fflush(_log_fp);
}
#endif

47
src/hotspot/share/runtime/memprofiler.hpp
View File

@ -1,47 +0,0 @@
/*
* Copyright (c) 1998, 2019, 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_RUNTIME_MEMPROFILER_HPP
#define SHARE_RUNTIME_MEMPROFILER_HPP
// Prints periodic memory usage trace of HotSpot VM
class MemProfilerTask;
class MemProfiler : AllStatic {
friend class MemProfilerTask;
private:
static MemProfilerTask* _task;
static FILE* _log_fp;
// Do trace (callback from MemProfilerTask and from disengage)
static void do_trace() PRODUCT_RETURN;
public:
// Start/stop the profiler
static void engage() PRODUCT_RETURN;
static void disengage() PRODUCT_RETURN;
// Tester
static bool is_active() PRODUCT_RETURN0;
};
#endif // SHARE_RUNTIME_MEMPROFILER_HPP

2
src/hotspot/share/runtime/thread.cpp
View File

@ -87,7 +87,6 @@
#include "runtime/javaCalls.hpp" #include "runtime/javaCalls.hpp"
#include "runtime/jniHandles.inline.hpp" #include "runtime/jniHandles.inline.hpp"
#include "runtime/jniPeriodicChecker.hpp" #include "runtime/jniPeriodicChecker.hpp"
#include "runtime/memprofiler.hpp"
#include "runtime/monitorDeflationThread.hpp" #include "runtime/monitorDeflationThread.hpp"
#include "runtime/mutexLocker.hpp" #include "runtime/mutexLocker.hpp"
#include "runtime/nonJavaThread.hpp" #include "runtime/nonJavaThread.hpp"
@ -3382,7 +3381,6 @@ jint Threads::create_vm(JavaVMInitArgs* args, bool* canTryAgain) {
} }
#endif // INCLUDE_MANAGEMENT #endif // INCLUDE_MANAGEMENT
if (MemProfiling) MemProfiler::engage();
StatSampler::engage(); StatSampler::engage();
if (CheckJNICalls) JniPeriodicChecker::engage(); if (CheckJNICalls) JniPeriodicChecker::engage();