--- old/./.hgignore Tue Feb 9 19:31:15 2016 +++ new/./.hgignore Tue Feb 9 19:31:13 2016 @@ -10,7 +10,6 @@ .igv.log ^.hgtip .DS_Store -\.class$ ^\.mx.jvmci/env ^\.mx.jvmci/.*\.pyc ^\.mx.jvmci/eclipse-launches/.* --- old/src/cpu/aarch64/vm/globals_aarch64.hpp Tue Feb 9 19:31:20 2016 +++ new/src/cpu/aarch64/vm/globals_aarch64.hpp Tue Feb 9 19:31:18 2016 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2015, Red Hat Inc. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -32,7 +32,6 @@ // Sets the default values for platform dependent flags used by the runtime system. // (see globals.hpp) -define_pd_global(bool, ConvertSleepToYield, true); define_pd_global(bool, ShareVtableStubs, true); define_pd_global(bool, NeedsDeoptSuspend, false); // only register window machines need this --- old/src/cpu/ppc/vm/globals_ppc.hpp Tue Feb 9 19:31:25 2016 +++ new/src/cpu/ppc/vm/globals_ppc.hpp Tue Feb 9 19:31:23 2016 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2012, 2015 SAP SE. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -32,7 +32,6 @@ // Sets the default values for platform dependent flags used by the runtime system. // (see globals.hpp) -define_pd_global(bool, ConvertSleepToYield, true); define_pd_global(bool, ShareVtableStubs, false); // Improves performance markedly for mtrt and compress. define_pd_global(bool, NeedsDeoptSuspend, false); // Only register window machines need this. --- old/src/cpu/sparc/vm/globals_sparc.hpp Tue Feb 9 19:31:29 2016 +++ new/src/cpu/sparc/vm/globals_sparc.hpp Tue Feb 9 19:31:28 2016 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2016, 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 @@ -37,7 +37,6 @@ // the load of the dispatch address and hence the jmp would still go to the location // according to the prior table. So, we let the thread continue and let it block by itself. define_pd_global(bool, DontYieldALot, true); // yield no more than 100 times per second -define_pd_global(bool, ConvertSleepToYield, false); // do not convert sleep(0) to yield. Helps GUI define_pd_global(bool, ShareVtableStubs, false); // improves performance markedly for mtrt and compress define_pd_global(bool, NeedsDeoptSuspend, true); // register window machines need this --- old/src/cpu/x86/vm/globals_x86.hpp Tue Feb 9 19:31:34 2016 +++ new/src/cpu/x86/vm/globals_x86.hpp Tue Feb 9 19:31:33 2016 @@ -31,7 +31,6 @@ // Sets the default values for platform dependent flags used by the runtime system. // (see globals.hpp) -define_pd_global(bool, ConvertSleepToYield, true); define_pd_global(bool, ShareVtableStubs, true); define_pd_global(bool, NeedsDeoptSuspend, false); // only register window machines need this --- old/src/cpu/zero/vm/globals_zero.hpp Tue Feb 9 19:31:39 2016 +++ new/src/cpu/zero/vm/globals_zero.hpp Tue Feb 9 19:31:38 2016 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved. * Copyright 2007, 2008, 2009, 2010, 2011 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -32,7 +32,6 @@ // Set the default values for platform dependent flags used by the // runtime system. See globals.hpp for details of what they do. -define_pd_global(bool, ConvertSleepToYield, true); define_pd_global(bool, ShareVtableStubs, true); define_pd_global(bool, NeedsDeoptSuspend, false); --- old/src/share/vm/runtime/arguments.cpp Tue Feb 9 19:31:44 2016 +++ new/src/share/vm/runtime/arguments.cpp Tue Feb 9 19:31:43 2016 @@ -333,6 +333,8 @@ // --- Non-alias flags - sorted by obsolete_in then expired_in: { "MaxGCMinorPauseMillis", JDK_Version::jdk(8), JDK_Version::undefined(), JDK_Version::undefined() }, { "UseParNewGC", JDK_Version::jdk(9), JDK_Version::undefined(), JDK_Version::jdk(10) }, + { "ConvertSleepToYield", JDK_Version::jdk(9), JDK_Version::jdk(10), JDK_Version::jdk(11) }, + { "ConvertYieldToSleep", JDK_Version::jdk(9), JDK_Version::jdk(10), JDK_Version::jdk(11) }, // --- Deprecated alias flags (see also aliased_jvm_flags) - sorted by obsolete_in then expired_in: { "DefaultMaxRAMFraction", JDK_Version::jdk(8), JDK_Version::undefined(), JDK_Version::undefined() }, --- old/src/share/vm/runtime/globals.hpp Tue Feb 9 19:31:49 2016 +++ new/src/share/vm/runtime/globals.hpp Tue Feb 9 19:31:48 2016 @@ -1239,9 +1239,8 @@ product_pd(bool, DontYieldALot, \ "Throw away obvious excess yield calls") \ \ - product_pd(bool, ConvertSleepToYield, \ - "Convert sleep(0) to thread yield " \ - "(may be off for Solaris to improve GUI)") \ + product(bool, ConvertSleepToYield, true, \ + "Convert sleep(0) to thread yield ") \ \ product(bool, ConvertYieldToSleep, false, \ "Convert yield to a sleep of MinSleepInterval to simulate Win32 " \ --- old/test/runtime/CommandLine/VMDeprecatedOptions.java Tue Feb 9 19:31:54 2016 +++ new/test/runtime/CommandLine/VMDeprecatedOptions.java Tue Feb 9 19:31:53 2016 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -40,6 +40,8 @@ // deprecated non-alias flags: {"MaxGCMinorPauseMillis", "1032"}, {"UseParNewGC", "false"}, + {"ConvertSleepToYield", "false" }, + {"ConvertYieldToSleep", "false" }, // deprecated alias flags (see also aliased_jvm_flags): {"DefaultMaxRAMFraction", "4"},