[15] RFR(XXS): 8248475: Suppress unconditional warning "JFR will be disabled during CDS dumping"

[Markus Gronlund]

Thanks Claes!

Markus

-----Original Message-----
From: Claes Redestad 
Sent: den 29 juni 2020 12:48
To: Markus Gronlund <markus.gronlund at oracle.com>; hotspot-jfr-dev <hotspot-jfr-dev at openjdk.java.net>
Subject: Re: [15] RFR(XXS): 8248475: Suppress unconditional warning "JFR will be disabled during CDS dumping"

Looks good to me!

/Claes

On 2020-06-29 12:15, Markus Gronlund wrote:
> Greetings,
> 
> Please review this small change to restore the warning output to pre-JDK-8241718.
> 
> Bug: https://bugs.openjdk.java.net/browse/JDK-8248475
> 
> diff -r a707b9457c83 -r ca52af8d993e src/hotspot/share/jfr/recorder/jfrRecorder.cpp
> --- a/src/hotspot/share/jfr/recorder/jfrRecorder.cpp   Mon Jun 29 08:21:42 2020 +0200
> +++ b/src/hotspot/share/jfr/recorder/jfrRecorder.cpp   Mon Jun 29 12:10:26 2020 +0200
> @@ -173,7 +173,7 @@
> 
>   static bool is_cds_dump_requested() {
>     // we will not be able to launch recordings on startup if a cds dump is being requested
> -  if (Arguments::is_dumping_archive()) {
> +  if (Arguments::is_dumping_archive() && JfrOptionSet::start_flight_recording_options() != NULL) {
>       warning("JFR will be disabled during CDS dumping");
>       teardown_startup_support();
>       return true;
> 
> Thanks to Claes Redestad for reporting this.
> 
> Thanks
> Markus
>