[11u] RFR (XS) 8210131: vmTestbase/nsk/jvmti/scenarios/allocation/AP10/ap10t001/TestDescription.java failed with ObjectFree: GetCurrentThreadCpuTimerInfo returned unexpected error code

[Langer, Christoph]

Hi Aleksey,

sure, looks good ��

Cheers
Christoph

> -----Original Message-----
> From: jdk-updates-dev <jdk-updates-dev-retn at openjdk.java.net> On
> Behalf Of Aleksey Shipilev
> Sent: Donnerstag, 27. August 2020 10:51
> To: jdk-updates-dev at openjdk.java.net
> Subject: [11u] RFR (XS) 8210131:
> vmTestbase/nsk/jvmti/scenarios/allocation/AP10/ap10t001/TestDescription.
> java failed with ObjectFree: GetCurrentThreadCpuTimerInfo returned
> unexpected error code
> 
> Hi,
> 
> I have already got the approval for this push to 11u, but when checking the
> patch queue, I realized
> the patch does not apply cleanly, because there is a problem list change from
> a subtask:
>    http://hg.openjdk.java.net/jdk/jdk/rev/0cd55d573893
> 
> The problem list addition does not apply cleanly by itself. So for this backport,
> I opt to drop the
> problem list addition and removal.
> 
> Upstream version:
>     http://hg.openjdk.java.net/jdk/jdk/rev/53e61697a020
> 
> 11u version omits the problem list hunk:
> 
> diff -r 29196ae99fe5 src/hotspot/share/prims/jvmtiEnter.xsl
> --- a/src/hotspot/share/prims/jvmtiEnter.xsl    Mon May 25 11:05:23 2020
> +0200
> +++ b/src/hotspot/share/prims/jvmtiEnter.xsl    Thu Aug 27 10:49:15 2020
> +0200
> @@ -403,11 +403,11 @@
>         <xsl:text>if (this_thread == NULL || !this_thread->is_Java_thread())
> {</xsl:text>
>       </xsl:when>
>       <xsl:otherwise>
>         <xsl:choose>
>           <xsl:when test="count(@phase)=0 or contains(@phase,'live') or
> contains(@phase,'start')">
> -         <xsl:text>if (this_thread == NULL || (!this_thread->is_Java_thread()
> &&
> !this_thread->is_VM_thread())) {</xsl:text>
> +         <xsl:text>if (this_thread == NULL || (!this_thread->is_Java_thread()
> &&
> !this_thread->is_Named_thread())) {</xsl:text>
>           </xsl:when>
>           <xsl:otherwise>
>             <xsl:text>if (!this_thread->is_Java_thread()) {</xsl:text>
>           </xsl:otherwise>
>         </xsl:choose>
> 
> Any concerns?
> 
> --
> Thanks,
> -Aleksey