. Include the thread id so that jstack can provide stack traces when

analysing core dumps.
. Bump PORTREVISION.

PR:		211196
Submitted by:	Ron Roskens <ronald.roskens@gmail.com>
This commit is contained in:
Greg Lewis 2016-09-04 04:06:00 +00:00
parent b59414ce0f
commit 71b1ef1dd5
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=421302
3 changed files with 38 additions and 0 deletions

View file

@ -2,6 +2,7 @@
PORTNAME= openjdk
PORTVERSION= ${JDK_MAJOR_VERSION}.${JDK_UPDATE_VERSION}.${JDK_BUILD_NUMBER:S/^0//}
PORTREVISION= 1
CATEGORIES= java devel
MASTER_SITES= http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}/promoted/b${DIST_BUILD_NUMBER}/:jdk \
https://adopt-openjdk.ci.cloudbees.com/job/jtreg/${JTREG_JENKINS_BUILD}/artifact/:jtreg \

View file

@ -0,0 +1,11 @@
--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThread.java.orig 2016-05-14 19:57:37.394543000 +0000
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThread.java 2016-05-14 20:47:09.600014000 +0000
@@ -61,7 +62,7 @@
}
public String toString() {
- return Integer.toString(thread_id);
+ return Integer.toString(thread_id) + "/" + Long.toString(unique_thread_id);
}
public ThreadContext getContext() throws IllegalThreadStateException {

View file

@ -0,0 +1,26 @@
--- ./hotspot/src/os/bsd/vm/os_bsd.cpp 2016-06-01 20:57:38.276230000 -0500
+++ ./hotspot/src/os/bsd/vm/os_bsd.cpp 2016-06-01 20:56:46.380667000 -0500
@@ -767,6 +767,11 @@
guarantee(unique_thread_id != 0, "unique thread id was not found");
osthread->set_unique_thread_id(unique_thread_id);
#endif
+#ifdef __FreeBSD__
+ uint64_t unique_thread_id = os::Bsd::gettid();
+ guarantee(unique_thread_id != 0, "unique thread id was not found");
+ osthread->set_unique_thread_id(unique_thread_id);
+#endif
// initialize signal mask for this thread
os::Bsd::hotspot_sigmask(thread);
@@ -930,6 +935,11 @@
guarantee(unique_thread_id != 0, "just checking");
osthread->set_unique_thread_id(unique_thread_id);
#endif
+#ifdef __FreeBSD__
+ uint64_t unique_thread_id = os::Bsd::gettid();
+ guarantee(unique_thread_id != 0, "unique thread id was not found");
+ osthread->set_unique_thread_id(unique_thread_id);
+#endif
osthread->set_pthread_id(::pthread_self());
// initialize floating point control register