RFR(XXS): 8213172: CDS and JFR tests fail with assert(JdkJfrEvent::is(klass)) failed: invariant

[Markus Gronlund]

Thanks Jiangli!

Markus

-----Original Message-----
From: Jiangli Zhou 
Sent: den 31 oktober 2018 18:23
To: Markus Gronlund <markus.gronlund at oracle.com>; Ioi Lam <ioi.lam at oracle.com>; Calvin Cheung <calvin.cheung at oracle.com>
Cc: hotspot-jfr-dev at openjdk.java.net; Erik Gahlin <erik.gahlin at oracle.com>
Subject: Re: RFR(XXS): 8213172: CDS and JFR tests fail with assert(JdkJfrEvent::is(klass)) failed: invariant

Hi Markus,

Probably is too late, but looks good!

Thanks,

Jiangli


On 10/30/18 11:40 PM, Markus Gronlund wrote:
> Thanks Erik,
>
> Can I please get an ok from someone in the cds team on this as well?
>
> Thanks in advance
> Markus
>
> -----Original Message-----
> From: Erik Gahlin
> Sent: den 31 oktober 2018 07:35
> To: Markus Gronlund <markus.gronlund at oracle.com>
> Cc: hotspot-jfr-dev at openjdk.java.net; Jiangli Zhou <jiangli.zhou at oracle.com>; Ioi Lam <ioi.lam at oracle.com>; Calvin Cheung <calvin.cheung at oracle.com>
> Subject: Re: RFR(XXS): 8213172: CDS and JFR tests fail with assert(JdkJfrEvent::is(klass)) failed: invariant
>
> Looks good.
>
> Erik
>
>> On 31 Oct 2018, at 07:27, Markus Gronlund <markus.gronlund at oracle.com> wrote:
>>
>> Hello,
>>
>> JDK-8203629 changed the top level JFR event class hierarchy from jdk.jfr.Event to jdk.internal.event.Event.
>>
>> Unfortunately the CDS exclusion filter for the JFR event classes was not updated accordingly, so let's do that here instead:
>>
>> Bug: https://bugs.openjdk.java.net/browse/JDK-8213172
>> Webrev: http://cr.openjdk.java.net/~mgronlun/8213172/webrev01/
>>
>> This change makes the adjustment to dictionary.cpp:
>>
>> diff -r 385609cec1f8 src/hotspot/share/classfile/dictionary.cpp
>> --- a/src/hotspot/share/classfile/dictionary.cpp Wed Oct 31 05:26:07 2018 +0100
>> +++ b/src/hotspot/share/classfile/dictionary.cpp Wed Oct 31 06:05:04 2018 +0100
>> @@ -468,7 +468,7 @@
>>   #if INCLUDE_CDS
>>   static bool is_jfr_event_class(Klass *k) {
>>     while (k) {
>> - if (k->name()->equals("jdk/jfr/Event")) {
>> + if (k->name()->equals("jdk/internal/event/Event")) {
>>         return true;
>>       }
>>       k = k->super();
>>
>>
>> Tests:
>> open/test/hotspot/jtreg/:hotspot_appcds
>> tier1, tier2, tier3
>>
>> Thanks
>> Markus
>>