stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Jesper Wilhelmsson 2017-04-18 20:31:23 +02:00
commit d099c0815e
11 changed files with 46 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jdk/make/test/JtregNative.gmk
View File

@ -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. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
# #
# This code is free software; you can redistribute it and/or modify it # This code is free software; you can redistribute it and/or modify it
@ -35,12 +35,14 @@ include $(SPEC)
include MakeBase.gmk include MakeBase.gmk
include TestFilesCompilation.gmk include TestFilesCompilation.gmk
$(eval $(call IncludeCustomExtension, jdk, test/JtregNative.gmk))
################################################################################ ################################################################################
# Targets for building the native tests themselves. # Targets for building the native tests themselves.
################################################################################ ################################################################################
# Add more directories here when needed. # Add more directories here when needed.
BUILD_JDK_JTREG_NATIVE_SRC := \ BUILD_JDK_JTREG_NATIVE_SRC += \
$(JDK_TOPDIR)/test/native_sanity \ $(JDK_TOPDIR)/test/native_sanity \
# #

3
jdk/src/java.base/macosx/native/libjli/java_md_macosx.c
View File

@ -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. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -886,6 +886,7 @@ ContinueInNewThread0(int (JNICALL *continuation)(void *), jlong stack_size, void
if (stack_size > 0) { if (stack_size > 0) {
pthread_attr_setstacksize(&attr, stack_size); 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) { if (pthread_create(&tid, &attr, (void *(*)(void*))continuation, (void*)args) == 0) {
void * tmp; void * tmp;

4
jdk/src/java.base/share/native/libjli/java.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1995, 2016, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1995, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -201,7 +201,7 @@ static jlong initialHeapSize = 0; /* inital heap size */
* A minimum -Xss stack size suitable for all platforms. * A minimum -Xss stack size suitable for all platforms.
*/ */
#ifndef STACK_SIZE_MINIMUM #ifndef STACK_SIZE_MINIMUM
#define STACK_SIZE_MINIMUM (32 * KB) #define STACK_SIZE_MINIMUM (64 * KB)
#endif #endif
/* /*

4
jdk/src/java.base/unix/classes/module-info.java.extra
View File

@ -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. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -32,5 +32,3 @@ opens com.sun.crypto.provider to jdk.internal.vm.compiler;
exports jdk.internal.module to jdk.internal.vm.compiler; exports jdk.internal.module to jdk.internal.vm.compiler;
// AOT uses jdk.internal.misc.Unsafe
exports jdk.internal.misc to jdk.aot;

3
jdk/src/java.base/unix/native/libjli/java_md_solinux.c
View File

@ -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. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -899,6 +899,7 @@ ContinueInNewThread0(int (JNICALL *continuation)(void *), jlong stack_size, void
if (stack_size > 0) { if (stack_size > 0) {
pthread_attr_setstacksize(&attr, stack_size); 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) { if (pthread_create(&tid, &attr, (void *(*)(void*))continuation, (void*)args) == 0) {
void * tmp; void * tmp;

12
jdk/src/java.base/windows/classes/module-info.java.extra
View File

@ -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. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * 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.rsa to jdk.crypto.mscapi;
exports sun.security.internal.spec to jdk.crypto.mscapi; exports sun.security.internal.spec to jdk.crypto.mscapi;
exports sun.security.util 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;

14
jdk/src/jdk.jdwp.agent/share/native/libjdwp/debugLoop.c
View File

@ -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. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -125,15 +125,13 @@ debugLoop_run(void)
jboolean replyToSender = JNI_TRUE; 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 * 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 * before the thread posting the VM_DEATH continues VM
* termination. * termination.
*/ */
if (cmd->cmdSet == JDWP_COMMAND_SET(VirtualMachine)){ debugMonitorEnter(vmDeathLock);
debugMonitorEnter(vmDeathLock);
}
/* Initialize the input and output streams */ /* Initialize the input and output streams */
inStream_init(&in, p); inStream_init(&in, p);
@ -172,9 +170,7 @@ debugLoop_run(void)
/* /*
* Release the vmDeathLock as the reply has been posted. * Release the vmDeathLock as the reply has been posted.
*/ */
if (cmd->cmdSet == JDWP_COMMAND_SET(VirtualMachine)){ debugMonitorExit(vmDeathLock);
debugMonitorExit(vmDeathLock);
}
inStream_destroy(&in); inStream_destroy(&in);
outStream_destroy(&out); outStream_destroy(&out);

8
jdk/src/jdk.jdwp.agent/share/native/libjdwp/eventHelper.c
View File

@ -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. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -240,10 +240,10 @@ dequeueCommand(void)
size = commandSize(command); size = commandSize(command);
/* /*
* Immediately close out any commands enqueued from a * Immediately close out any commands enqueued from
* previously attached debugger. * 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); log_debugee_location("dequeueCommand(): command session removal", NULL, NULL, 0);
completeCommand(command); completeCommand(command);
command = NULL; command = NULL;

4
jdk/test/sun/tools/jcmd/TestJcmdDefaults.java
View File

@ -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. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -49,7 +49,7 @@ public class TestJcmdDefaults {
private static final String TEST_SRC = System.getProperty("test.src").trim(); 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[] 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 { public static void main(String[] args) throws Exception {
testJcmdUsage("-h"); testJcmdUsage("-h");

8
jdk/test/tools/launcher/Settings.java
View File

@ -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. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -73,9 +73,9 @@ public class Settings extends TestHelper {
} }
static void runTestOptionDefault() throws IOException { static void runTestOptionDefault() throws IOException {
String stackSize = "256"; // in kb int stackSize = 256; // in kb
if (getArch().equals("ppc64") || getArch().equals("ppc64le")) { if (getArch().equals("ppc64") || getArch().equals("ppc64le")) {
stackSize = "800"; stackSize = 800;
} }
TestResult tr; TestResult tr;
tr = doExec(javaCmd, "-Xms64m", "-Xmx512m", tr = doExec(javaCmd, "-Xms64m", "-Xmx512m",
@ -86,7 +86,7 @@ public class Settings extends TestHelper {
throw new RuntimeException("test fails"); throw new RuntimeException("test fails");
} }
tr = doExec(javaCmd, "-Xms65536k", "-Xmx712m", tr = doExec(javaCmd, "-Xms65536k", "-Xmx712m",
"-Xss" + stackSize + "000", "-XshowSettings", "-jar", testJar.getAbsolutePath()); "-Xss" + (stackSize * 1024), "-XshowSettings", "-jar", testJar.getAbsolutePath());
containsAllOptions(tr); containsAllOptions(tr);
if (!tr.isOK()) { if (!tr.isOK()) {
System.out.println(tr); System.out.println(tr);

12
jdk/test/tools/launcher/TooSmallStackSize.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -155,15 +155,21 @@ public class TooSmallStackSize extends TestHelper {
checkStack("16k"); checkStack("16k");
/* /*
* Try with a 32k stack size, which is the size that the launcher will * Try with a 64k stack size, which is the size that the launcher will
* set to if you try setting to anything smaller. This should produce the same * set to if you try setting to anything smaller. This should produce the same
* result as setting to 16k if the fix for 6762191 is in place. * result as setting to 16k if the fix for 6762191 is in place.
*/ */
String min_stack_allowed = checkStack("32k"); String min_stack_allowed = checkStack("64k");
/* /*
* Try again with a the minimum stack size that was given in the error message * Try again with a the minimum stack size that was given in the error message
*/ */
checkMinStackAllowed(min_stack_allowed); checkMinStackAllowed(min_stack_allowed);
/*
* Try again with a size that is not OS page aligned. This is to help test that
* asserts added for 8176768 are not triggered.
*/
checkMinStackAllowed("513k");
} }
} }