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

8340213: jcmd VM.events ignores max argument

Browse Source 
Reviewed-by: szaldana, cjplummer, amenkov, mli
This commit is contained in:
Leonid Mesnik 2024-09-17 22:36:37 +00:00
parent dfc90938ba
commit 202fd421f7
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/hotspot/share/services/diagnosticCommand.cpp
View File

@ -899,7 +899,6 @@ void EventLogDCmd::execute(DCmdSource source, TRAPS) {
int max = -1;
if (max_value != nullptr) {
char* endptr = nullptr;
int max;
if (!parse_integer(max_value, &max)) {
output()->print_cr("Invalid max option: \"%s\".", max_value);
return;

24
test/hotspot/jtreg/serviceability/dcmd/vm/EventsTest.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2019, 2024, 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
@ -25,6 +25,7 @@ import jdk.test.lib.dcmd.CommandExecutor;
import jdk.test.lib.dcmd.JMXExecutor;
import jdk.test.lib.process.OutputAnalyzer;
import org.testng.annotations.Test;
import org.testng.Assert;
/*
* @test
@ -38,6 +39,9 @@ import org.testng.annotations.Test;
*/
public class EventsTest {
// MAX should be less than number of actually recorded events
private static int MAX = 9;
static String buildHeaderPattern(String logname) {
return "^" + logname + ".*\\(\\d+ events\\):";
}
@ -64,9 +68,27 @@ public class EventsTest {
output.stdoutShouldNotMatch(buildHeaderPattern("Classes unloaded"));
}
public void run_max(CommandExecutor executor) {
OutputAnalyzer output = executor.execute("VM.events max=" + MAX);
long lines = output.asLines().stream().filter(x -> x.contains("Loading class")).count();
Assert.assertTrue(lines == MAX, "There are should be " + MAX + " lines");
}
public void run_max_selected(CommandExecutor executor) {
OutputAnalyzer output = executor.execute("VM.events log=load max=" + MAX);
output.stdoutShouldMatch(buildHeaderPattern("Classes loaded"));
long lines = output.asLines().stream().filter(x -> x.contains("Loading class")).count();
Assert.assertTrue(lines == MAX, "There are should be " + MAX + " lines");
output.stdoutShouldNotMatch(buildHeaderPattern("Events"));
output.stdoutShouldNotMatch(buildHeaderPattern("Compilation"));
}
@Test
public void jmx() {
run_all(new JMXExecutor());
run_selected(new JMXExecutor());
run_max(new JMXExecutor());
run_max_selected(new JMXExecutor());
}
}