RFR: 8252324: Signal related code should be shared among POSIX platforms [v4]

Gerard Ziemski gziemski at openjdk.java.net
Mon Sep 28 19:38:10 UTC 2020


On Mon, 28 Sep 2020 02:20:00 GMT, David Holmes <dholmes at openjdk.org> wrote:

>> Gerard Ziemski has updated the pull request incrementally with one additional commit since the last revision:
>> 
>>   Revert "Add AIX specific SA code"
>>   
>>   This reverts commit cc13700d7d3f15927e22d92d9f5ec9a0739ef9a1.
>
> src/hotspot/os/linux/os_linux.cpp line 1685:
> 
>> 1683:                 filename);
>> 1684:
>> 1685:         assert(Thread::current()->is_Java_thread(), "must be Java thread");
> 
> This assertion is already inside JavaThread::current().

Merge issue, fixed...

> src/hotspot/os/posix/os_posix.cpp line 1456:
> 
>> 1454:   Thread* thread = Thread::current();
>> 1455:   assert(thread->is_Java_thread(), "Must be JavaThread");
>> 1456:   JavaThread *jt = (JavaThread *)thread;
> 
> This change is unnecessary. Please restore the original line JavaThread::current() call.

Merge issue, fixed.

> src/hotspot/os/posix/os_posix.cpp line 1501:
> 
>> 1499:   }
>> 1500:
>> 1501:   OSThreadWaitState osts(thread->osthread(), false /* not Object.wait() */);
> 
> Unnecessary change - just use jt

Merge issue, fixed.

> src/hotspot/os_cpu/aix_ppc/os_aix_ppc.cpp line 232:
> 
>> 230:     if (t != NULL) {
>> 231:       if(t->is_Java_thread()) {
>> 232:         thread = (JavaThread*)t;
> 
> Mis-merge? Please put this back to t->as_Java_thread()

Merge issue, fixed.

> src/hotspot/os_cpu/bsd_x86/os_bsd_x86.cpp line 461:
> 
>> 459:     if (t != NULL ){
>> 460:       if(t->is_Java_thread()) {
>> 461:         thread = (JavaThread*)t;
> 
> Mis-merge? Please put this back to t->as_Java_thread()

Merge issue, fixed.

> src/hotspot/os_cpu/bsd_zero/os_bsd_zero.cpp line 160:
> 
>> 158:     if (t != NULL ){
>> 159:       if(t->is_Java_thread()) {
>> 160:         thread = (JavaThread*)t;
> 
> Mis-merge? Please put this back to t->as_Java_thread()

Merge issue, fixed.

> src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.cpp line 241:
> 
>> 239:     if (t != NULL ){
>> 240:       if(t->is_Java_thread()) {
>> 241:         thread = (JavaThread*)t;
> 
> Mis-merge? Please put this back to t->as_Java_thread()

Merge issue, fixed.

> src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp line 300:
> 
>> 298:     if (t != NULL ){
>> 299:       if(t->is_Java_thread()) {
>> 300:         thread = (JavaThread*)t;
> 
> Mis-merge? Please put this back to t->as_Java_thread()

Merge issue, fixed.

> src/hotspot/os_cpu/linux_ppc/os_linux_ppc.cpp line 284:
> 
>> 282:     if (t != NULL) {
>> 283:       if(t->is_Java_thread()) {
>> 284:         thread = (JavaThread*)t;
> 
> Mis-merge? Please put this back to t->as_Java_thread()

Merge issue, fixed.

> src/hotspot/os_cpu/linux_s390/os_linux_s390.cpp line 284:
> 
>> 282:     if (t != NULL) {
>> 283:       if(t->is_Java_thread()) {
>> 284:         thread = (JavaThread*)t;
> 
> Mis-merge? Please put this back to t->as_Java_thread()

Merge issue, fixed.

> src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp line 280:
> 
>> 278:     if (t != NULL ){
>> 279:       if(t->is_Java_thread()) {
>> 280:         thread = (JavaThread*)t;
> 
> Mis-merge? Please put this back to t->as_Java_thread()

Merge issue, fixed.

> src/hotspot/os_cpu/linux_zero/os_linux_zero.cpp line 156:
> 
>> 154:     if (t != NULL ){
>> 155:       if(t->is_Java_thread()) {
>> 156:         thread = (JavaThread*)t;
> 
> Mis-merge? Please put this back to t->as_Java_thread()

Merge issue, fixed.

-------------

PR: https://git.openjdk.java.net/jdk/pull/157


More information about the hotspot-runtime-dev mailing list