From owner-svn-ports-all@freebsd.org Sun Sep 4 04:06:02 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 02D30BCE3F0; Sun, 4 Sep 2016 04:06:02 +0000 (UTC) (envelope-from glewis@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D2DE5797; Sun, 4 Sep 2016 04:06:01 +0000 (UTC) (envelope-from glewis@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u84461hU001833; Sun, 4 Sep 2016 04:06:01 GMT (envelope-from glewis@FreeBSD.org) Received: (from glewis@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u844606q001829; Sun, 4 Sep 2016 04:06:00 GMT (envelope-from glewis@FreeBSD.org) Message-Id: <201609040406.u844606q001829@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: glewis set sender to glewis@FreeBSD.org using -f From: Greg Lewis Date: Sun, 4 Sep 2016 04:06:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r421302 - in head/java/openjdk8: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 Sep 2016 04:06:02 -0000 Author: glewis Date: Sun Sep 4 04:06:00 2016 New Revision: 421302 URL: https://svnweb.freebsd.org/changeset/ports/421302 Log: . Include the thread id so that jstack can provide stack traces when analysing core dumps. . Bump PORTREVISION. PR: 211196 Submitted by: Ron Roskens Added: head/java/openjdk8/files/patch-hotspot-agent-src-share-classes-sun-jvm-hotspot-debugger-bsd-BsdThread.java (contents, props changed) head/java/openjdk8/files/patch-hotspot-src-os-bsd-vm-os_bsd.cpp (contents, props changed) Modified: head/java/openjdk8/Makefile Modified: head/java/openjdk8/Makefile ============================================================================== --- head/java/openjdk8/Makefile Sun Sep 4 00:51:22 2016 (r421301) +++ head/java/openjdk8/Makefile Sun Sep 4 04:06:00 2016 (r421302) @@ -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 \ Added: head/java/openjdk8/files/patch-hotspot-agent-src-share-classes-sun-jvm-hotspot-debugger-bsd-BsdThread.java ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/java/openjdk8/files/patch-hotspot-agent-src-share-classes-sun-jvm-hotspot-debugger-bsd-BsdThread.java Sun Sep 4 04:06:00 2016 (r421302) @@ -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 { Added: head/java/openjdk8/files/patch-hotspot-src-os-bsd-vm-os_bsd.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/java/openjdk8/files/patch-hotspot-src-os-bsd-vm-os_bsd.cpp Sun Sep 4 04:06:00 2016 (r421302) @@ -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