diff options
Diffstat (limited to '')
-rw-r--r-- | java/openjdk8/files/patch-hotspot-agent-src-share-classes-sun-jvm-hotspot-debugger-bsd-BsdThread.java | 11 | ||||
-rw-r--r-- | java/openjdk8/files/patch-hotspot-src-os-bsd-vm-os_bsd.cpp | 26 |
2 files changed, 37 insertions, 0 deletions
diff --git a/java/openjdk8/files/patch-hotspot-agent-src-share-classes-sun-jvm-hotspot-debugger-bsd-BsdThread.java b/java/openjdk8/files/patch-hotspot-agent-src-share-classes-sun-jvm-hotspot-debugger-bsd-BsdThread.java new file mode 100644 index 000000000000..2f42fcb3672a --- /dev/null +++ b/java/openjdk8/files/patch-hotspot-agent-src-share-classes-sun-jvm-hotspot-debugger-bsd-BsdThread.java @@ -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 { diff --git a/java/openjdk8/files/patch-hotspot-src-os-bsd-vm-os_bsd.cpp b/java/openjdk8/files/patch-hotspot-src-os-bsd-vm-os_bsd.cpp new file mode 100644 index 000000000000..f66e7637372f --- /dev/null +++ b/java/openjdk8/files/patch-hotspot-src-os-bsd-vm-os_bsd.cpp @@ -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 |