Skip to content

8268425: Show decimal nid of OSThread instead of hex format one #4449

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
y1yang0 wants to merge 5 commits into from
Closed

8268425: Show decimal nid of OSThread instead of hex format one #4449

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
eb46926
print tid directly
y1yang0 Jun 9, 2021
4baeb17
restore cleanup code
y1yang0 Jun 28, 2021
0f23075
use UINT64_FORMAT; change SA and test impl
y1yang0 Jun 29, 2021
6d3d052
update copyright
y1yang0 Jun 30, 2021
7a30c3d
use \p{XDigit}
y1yang0 Jun 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/hotspot/share/runtime/osThread.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2021, 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
Expand Down Expand Up @@ -38,7 +38,7 @@ OSThread::~OSThread() {

// Printing
void OSThread::print_on(outputStream *st) const {
st->print("nid=0x%x ", thread_id());
st->print("nid=" UINT64_FORMAT " ", (uint64_t)thread_id());
Copy link
Member

@dholmes-ora dholmes-ora Jul 6, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are you forcing this to be a 64-bit type?

Copy link
Member Author

@y1yang0 y1yang0 Jul 6, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IMHO, I prefer using %d since a large portion of existing code using %d. Thomas suggests using UINT64_FORMAT rather than %d:

You'd do:

print("nid: " UINT64_FORMAT, (uint64_t) id):;

thread_t is, among other things, pthread_t, which is opaque. Any current code treating that as signed int is incorrect too.

There is no uniform format for the formatted output of thread_id in hotspot. As far as I can see, %ld %d and UINTX_FORMAT are used, so I want to left the decision to reviewers.

switch (_state) {
case ALLOCATED: st->print("allocated "); break;
case INITIALIZED: st->print("initialized "); break;
Expand Down
2 changes: 1 addition & 1 deletion src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/JavaThread.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -487,7 +487,7 @@ public void printThreadInfoOn(PrintStream out){
out.print(" tid=");
out.print(this.getAddress());
out.print(" nid=");
out.print(String.format("0x%x ",this.getOSThread().threadId()));
out.print(String.format("%d ",this.getOSThread().threadId()));
out.print(getOSThread().getThreadState().getPrintVal());
out.print(" [");
if(this.getLastJavaSP() == null){
Expand Down
7 changes: 4 additions & 3 deletions test/hotspot/jtreg/serviceability/sa/JhsdbThreadInfoTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2017, 2021, 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
Expand Down Expand Up @@ -60,8 +60,9 @@ public static void main(String[] args) throws Exception {
System.out.println(out.getStdout());
System.err.println(out.getStderr());

out.shouldMatch("\".+\" #\\d+ daemon prio=\\d+ tid=0x[0-9a-f]+ nid=0x[0-9a-f]+ .+ \\[0x[0-9a-f]+]");
out.shouldMatch("\"main\" #\\d+ prio=\\d+ tid=0x[0-9a-f]+ nid=0x[0-9a-f]+ .+ \\[0x[0-9a-f]+]");
// The character class \p{XDigit} matches any hexadecimal character.
out.shouldMatch("\".+\" #\\d+ daemon prio=\\d+ tid=0x\\p{XDigit}+ nid=\\d+ .+ \\[0x\\p{XDigit}+]");
out.shouldMatch("\"main\" #\\d+ prio=\\d+ tid=0x\\p{XDigit}+ nid=\\d+ .+ \\[0x\\p{XDigit}+]");
out.shouldMatch(" java.lang.Thread.State: .+");
out.shouldMatch(" JavaThread state: _thread_.+");

Expand Down