# HG changeset patch # User jwilhelm # Date 1489707640 25200 # Node ID 8b053ca26d6a6ddb547c54939eee8fbe8ab8bfaf # Parent bed865427a2f624a77f26013b36746b068a38328# Parent 292be53258b7ffab7eb845afc9bb05ce3f73c7c0 Merge diff -r bed865427a2f -r 8b053ca26d6a jdk/make/test/JtregNative.gmk --- a/jdk/make/test/JtregNative.gmk Wed Mar 22 17:24:14 2017 +0800 +++ b/jdk/make/test/JtregNative.gmk Thu Mar 16 16:40:40 2017 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2015, 2017, 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 @@ -35,12 +35,14 @@ include MakeBase.gmk include TestFilesCompilation.gmk +$(eval $(call IncludeCustomExtension, jdk, test/JtregNative.gmk)) + ################################################################################ # Targets for building the native tests themselves. ################################################################################ # Add more directories here when needed. -BUILD_JDK_JTREG_NATIVE_SRC := \ +BUILD_JDK_JTREG_NATIVE_SRC += \ $(JDK_TOPDIR)/test/native_sanity \ # diff -r bed865427a2f -r 8b053ca26d6a jdk/src/java.base/macosx/native/libjli/java_md_macosx.c --- a/jdk/src/java.base/macosx/native/libjli/java_md_macosx.c Wed Mar 22 17:24:14 2017 +0800 +++ b/jdk/src/java.base/macosx/native/libjli/java_md_macosx.c Thu Mar 16 16:40:40 2017 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2017, 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 @@ -886,6 +886,7 @@ if (stack_size > 0) { pthread_attr_setstacksize(&attr, stack_size); } + pthread_attr_setguardsize(&attr, 0); // no pthread guard page on java threads if (pthread_create(&tid, &attr, (void *(*)(void*))continuation, (void*)args) == 0) { void * tmp; diff -r bed865427a2f -r 8b053ca26d6a jdk/src/java.base/unix/classes/module-info.java.extra --- a/jdk/src/java.base/unix/classes/module-info.java.extra Wed Mar 22 17:24:14 2017 +0800 +++ b/jdk/src/java.base/unix/classes/module-info.java.extra Thu Mar 16 16:40:40 2017 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, 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 @@ -32,5 +32,3 @@ exports jdk.internal.module to jdk.internal.vm.compiler; -// AOT uses jdk.internal.misc.Unsafe -exports jdk.internal.misc to jdk.aot; diff -r bed865427a2f -r 8b053ca26d6a jdk/src/java.base/unix/native/libjli/java_md_solinux.c --- a/jdk/src/java.base/unix/native/libjli/java_md_solinux.c Wed Mar 22 17:24:14 2017 +0800 +++ b/jdk/src/java.base/unix/native/libjli/java_md_solinux.c Thu Mar 16 16:40:40 2017 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2017, 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 @@ -899,6 +899,7 @@ if (stack_size > 0) { pthread_attr_setstacksize(&attr, stack_size); } + pthread_attr_setguardsize(&attr, 0); // no pthread guard page on java threads if (pthread_create(&tid, &attr, (void *(*)(void*))continuation, (void*)args) == 0) { void * tmp; diff -r bed865427a2f -r 8b053ca26d6a jdk/src/java.base/windows/classes/module-info.java.extra --- a/jdk/src/java.base/windows/classes/module-info.java.extra Wed Mar 22 17:24:14 2017 +0800 +++ b/jdk/src/java.base/windows/classes/module-info.java.extra Thu Mar 16 16:40:40 2017 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2017, 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 @@ -26,3 +26,13 @@ exports sun.security.rsa to jdk.crypto.mscapi; exports sun.security.internal.spec to jdk.crypto.mscapi; exports sun.security.util to jdk.crypto.mscapi; + +// jdk.internal.vm.compiler uses Unsafe and VM classes from jdk.internal.misc +exports jdk.internal.misc to jdk.internal.vm.compiler; +opens jdk.internal.misc to jdk.internal.vm.compiler; + +// jdk.internal.vm.compiler uses com.sun.crypto.provider to generate crypto intrinsics +opens com.sun.crypto.provider to jdk.internal.vm.compiler; + +exports jdk.internal.module to jdk.internal.vm.compiler; + diff -r bed865427a2f -r 8b053ca26d6a jdk/src/jdk.jdwp.agent/share/native/libjdwp/debugLoop.c --- a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/debugLoop.c Wed Mar 22 17:24:14 2017 +0800 +++ b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/debugLoop.c Thu Mar 16 16:40:40 2017 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2017, 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 @@ -125,15 +125,13 @@ jboolean replyToSender = JNI_TRUE; /* - * For VirtualMachine commands we hold the vmDeathLock + * For all commands we hold the vmDeathLock * while executing and replying to the command. This ensures - * that a VM command after VM_DEATH will be allowed to complete + * that a command after VM_DEATH will be allowed to complete * before the thread posting the VM_DEATH continues VM * termination. */ - if (cmd->cmdSet == JDWP_COMMAND_SET(VirtualMachine)){ - debugMonitorEnter(vmDeathLock); - } + debugMonitorEnter(vmDeathLock); /* Initialize the input and output streams */ inStream_init(&in, p); @@ -172,9 +170,7 @@ /* * Release the vmDeathLock as the reply has been posted. */ - if (cmd->cmdSet == JDWP_COMMAND_SET(VirtualMachine)){ - debugMonitorExit(vmDeathLock); - } + debugMonitorExit(vmDeathLock); inStream_destroy(&in); outStream_destroy(&out); diff -r bed865427a2f -r 8b053ca26d6a jdk/src/jdk.jdwp.agent/share/native/libjdwp/eventHelper.c --- a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/eventHelper.c Wed Mar 22 17:24:14 2017 +0800 +++ b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/eventHelper.c Thu Mar 16 16:40:40 2017 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2017, 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 @@ -240,10 +240,10 @@ size = commandSize(command); /* - * Immediately close out any commands enqueued from a - * previously attached debugger. + * Immediately close out any commands enqueued from + * a dead VM or a previously attached debugger. */ - if (command->sessionID != currentSessionID) { + if (gdata->vmDead || command->sessionID != currentSessionID) { log_debugee_location("dequeueCommand(): command session removal", NULL, NULL, 0); completeCommand(command); command = NULL; diff -r bed865427a2f -r 8b053ca26d6a jdk/test/sun/tools/jcmd/TestJcmdDefaults.java --- a/jdk/test/sun/tools/jcmd/TestJcmdDefaults.java Wed Mar 22 17:24:14 2017 +0800 +++ b/jdk/test/sun/tools/jcmd/TestJcmdDefaults.java Thu Mar 16 16:40:40 2017 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2017, 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 @@ -50,7 +50,7 @@ private static final String TEST_SRC = System.getProperty("test.src").trim(); private static final String[] VM_ARGS = new String[] { "-XX:+UsePerfData" }; - private static final String JCMD_LIST_REGEX = "^\\d+\\s*.*"; + private static final String JCMD_LIST_REGEX = "(?s)^\\d+\\s*.*"; public static void main(String[] args) throws Exception { testJcmdUsage("-h"); diff -r bed865427a2f -r 8b053ca26d6a jdk/test/tools/launcher/Settings.java --- a/jdk/test/tools/launcher/Settings.java Wed Mar 22 17:24:14 2017 +0800 +++ b/jdk/test/tools/launcher/Settings.java Thu Mar 16 16:40:40 2017 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2017, 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 @@ -73,9 +73,9 @@ } static void runTestOptionDefault() throws IOException { - String stackSize = "256"; // in kb + int stackSize = 256; // in kb if (getArch().equals("ppc64") || getArch().equals("ppc64le")) { - stackSize = "800"; + stackSize = 800; } TestResult tr; tr = doExec(javaCmd, "-Xms64m", "-Xmx512m", @@ -86,7 +86,7 @@ throw new RuntimeException("test fails"); } tr = doExec(javaCmd, "-Xms65536k", "-Xmx712m", - "-Xss" + stackSize + "000", "-XshowSettings", "-jar", testJar.getAbsolutePath()); + "-Xss" + (stackSize * 1024), "-XshowSettings", "-jar", testJar.getAbsolutePath()); containsAllOptions(tr); if (!tr.isOK()) { System.out.println(tr);