Skip to content

Commit

Permalink
8292592: JFR test TestNative is not reliable due to low rate of sampl…
Browse files Browse the repository at this point in the history
…ing.

Reviewed-by: egahlin, shade
  • Loading branch information
robehn committed Aug 19, 2022
1 parent 58aae34 commit 45dec48
Show file tree
Hide file tree
Showing 2 changed files with 62 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,11 @@
* questions.
*/

package jdk.jfr.event.sampling;
package jdk.jfr.event.profiling;

import java.time.Duration;
import java.util.List;
import java.util.concurrent.Semaphore;
import java.util.concurrent.atomic.AtomicInteger;

import jdk.jfr.Recording;
import jdk.jfr.consumer.RecordedFrame;
import jdk.jfr.consumer.RecordingStream;
import jdk.jfr.internal.JVM;
import jdk.test.lib.jfr.EventNames;
Expand All @@ -40,20 +36,17 @@
* @requires vm.hasJFR
* @library /test/lib
* @modules jdk.jfr/jdk.jfr.internal
* @run main jdk.jfr.event.sampling.TestNative
* @run main jdk.jfr.event.profiling.TestNative
*/
public class TestNative {

final static String NATIVE_EVENT = EventNames.NativeMethodSample;

static volatile boolean alive = true;

// Please resist the temptation to speed up the test by decreasing
// the period. It is explicity set to 1100 ms to provoke the 1000 ms
// threshold in the JVM for os::naked_short_sleep().
public static void main(String[] args) throws Exception {
try (RecordingStream rs = new RecordingStream()) {
rs.enable(NATIVE_EVENT).withPeriod(Duration.ofMillis(1100));
rs.enable(NATIVE_EVENT).withPeriod(Duration.ofMillis(1));
rs.onEvent(NATIVE_EVENT, e -> {
alive = false;
rs.close();
Expand Down
59 changes: 59 additions & 0 deletions test/jdk/jdk/jfr/event/profiling/TestSamplingLongPeriod.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
/*
* Copyright (c) 2017, 2022, 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.
*/

package jdk.jfr.event.profiling;

import java.time.Duration;

import jdk.jfr.consumer.RecordingStream;
import jdk.test.lib.jfr.EventNames;
import jdk.test.lib.jfr.RecurseThread;

/*
* @test
* @key jfr
* @requires vm.hasJFR
* @library /test/lib
* @modules jdk.jfr/jdk.jfr.internal
* @run main jdk.jfr.event.profiling.TestSamplingLongPeriod
*/
public class TestSamplingLongPeriod {

final static String SAMPLE_EVENT = EventNames.ExecutionSample;

// The period is set to 1100 ms to provoke the 1000 ms
// threshold in the JVM for os::naked_short_sleep().
public static void main(String[] args) throws Exception {
RecurseThread t = new RecurseThread(50);
t.setDaemon(true);
try (RecordingStream rs = new RecordingStream()) {
rs.enable(SAMPLE_EVENT).withPeriod(Duration.ofMillis(1100));
rs.onEvent(SAMPLE_EVENT, e -> {
t.quit();
rs.close();
});
t.start();
rs.start();
}
}
}

1 comment on commit 45dec48

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.