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

8219566: JFR did not collect call stacks when MaxJavaStackTraceDepth is set to zero

Browse Source 
Reviewed-by: egahlin, mgronlun
This commit is contained in:
Yasumasa Suenaga 2019-04-24 17:09:24 +09:00
parent 17466b5a51
commit c576c3c3f5
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/hotspot/share/jfr/periodic/sampling/jfrCallTrace.cpp
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -27,6 +27,7 @@
#include "code/nmethod.hpp" #include "code/nmethod.hpp"
#include "code/pcDesc.hpp" #include "code/pcDesc.hpp"
#include "jfr/periodic/sampling/jfrCallTrace.hpp" #include "jfr/periodic/sampling/jfrCallTrace.hpp"
#include "jfr/utilities/jfrTypes.hpp"
#include "oops/method.hpp" #include "oops/method.hpp"
#include "runtime/javaCalls.hpp" #include "runtime/javaCalls.hpp"
#include "runtime/frame.inline.hpp" #include "runtime/frame.inline.hpp"
@ -37,7 +38,7 @@ bool JfrGetCallTrace::find_top_frame(frame& top_frame, Method** method, frame& f
assert(top_frame.cb() != NULL, "invariant"); assert(top_frame.cb() != NULL, "invariant");
RegisterMap map(_thread, false); RegisterMap map(_thread, false);
frame candidate = top_frame; frame candidate = top_frame;
for (int i = 0; i < MaxJavaStackTraceDepth * 2; ++i) { for (u4 i = 0; i < MAX_STACK_DEPTH * 2; ++i) {
if (candidate.is_entry_frame()) { if (candidate.is_entry_frame()) {
JavaCallWrapper *jcw = candidate.entry_frame_call_wrapper_if_safe(_thread); JavaCallWrapper *jcw = candidate.entry_frame_call_wrapper_if_safe(_thread);
if (jcw == NULL || jcw->is_first_frame()) { if (jcw == NULL || jcw->is_first_frame()) {

7
src/hotspot/share/jfr/recorder/service/jfrOptionSet.cpp
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -27,6 +27,7 @@
#include "jfr/recorder/service/jfrMemorySizer.hpp" #include "jfr/recorder/service/jfrMemorySizer.hpp"
#include "jfr/recorder/service/jfrOptionSet.hpp" #include "jfr/recorder/service/jfrOptionSet.hpp"
#include "jfr/utilities/jfrAllocation.hpp" #include "jfr/utilities/jfrAllocation.hpp"
#include "jfr/utilities/jfrTypes.hpp"
#include "logging/log.hpp" #include "logging/log.hpp"
#include "memory/allocation.inline.hpp" #include "memory/allocation.inline.hpp"
#include "memory/resourceArea.hpp" #include "memory/resourceArea.hpp"
@ -106,10 +107,6 @@ u4 JfrOptionSet::stackdepth() {
return _stack_depth; return _stack_depth;
} }
static const u4 STACK_DEPTH_DEFAULT = 64;
static const u4 MIN_STACK_DEPTH = 1;
static const u4 MAX_STACK_DEPTH = 2048;
void JfrOptionSet::set_stackdepth(u4 depth) { void JfrOptionSet::set_stackdepth(u4 depth) {
if (depth < MIN_STACK_DEPTH) { if (depth < MIN_STACK_DEPTH) {
_stack_depth = MIN_STACK_DEPTH; _stack_depth = MIN_STACK_DEPTH;

4
src/hotspot/share/jfr/recorder/stacktrace/jfrStackTraceRepository.cpp
View File

@ -69,8 +69,8 @@ void vframeStreamSamples::samples_next() {
} }
// handle general case // handle general case
int loop_count = 0; u4 loop_count = 0;
int loop_max = MaxJavaStackTraceDepth * 2; u4 loop_max = MAX_STACK_DEPTH * 2;
do { do {
loop_count++; loop_count++;
// By the time we get here we should never see unsafe but better safe then segv'd // By the time we get here we should never see unsafe but better safe then segv'd

3
src/hotspot/share/jfr/utilities/jfrTypes.hpp
View File

@ -33,6 +33,9 @@ typedef u8 traceid;
typedef int fio_fd; typedef int fio_fd;
const int invalid_fd = -1; const int invalid_fd = -1;
const jlong invalid_offset = -1; const jlong invalid_offset = -1;
const u4 STACK_DEPTH_DEFAULT = 64;
const u4 MIN_STACK_DEPTH = 1;
const u4 MAX_STACK_DEPTH = 2048;
enum EventStartTime { enum EventStartTime {
UNTIMED, UNTIMED,