Mercurial > hg > truffle

comparison src/share/vm/runtime/arguments.cpp @ 2181:d25d4ca69222

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge.
author Thomas Wuerthinger <wuerthinger@ssw.jku.at>
date Wed, 16 Feb 2011 13:47:20 +0100
parents 91fe28b03d6a 27e4ea99855d
children 2ab52cda08e5
comparison
equal deleted inserted replaced
2108:50b45e2d9725 2181:d25d4ca69222
1 /* 1 /*
2 * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 * 4 *
5 * This code is free software; you can redistribute it and/or modify it 5 * This code is free software; you can redistribute it and/or modify it
6 * under the terms of the GNU General Public License version 2 only, as 6 * under the terms of the GNU General Public License version 2 only, as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
922 } 922 }
923 return true; 923 return true;
924 } else if (strcmp(key, "sun.java.command") == 0) { 924 } else if (strcmp(key, "sun.java.command") == 0) {
925 _java_command = value; 925 _java_command = value;
926 926
927 // don't add this property to the properties exposed to the java application 927 // Record value in Arguments, but let it get passed to Java.
928 FreeHeap(key);
929 return true;
930 } else if (strcmp(key, "sun.java.launcher.pid") == 0) { 928 } else if (strcmp(key, "sun.java.launcher.pid") == 0) {
931 // launcher.pid property is private and is processed 929 // launcher.pid property is private and is processed
932 // in process_sun_java_launcher_properties(); 930 // in process_sun_java_launcher_properties();
933 // the sun.java.launcher property is passed on to the java application 931 // the sun.java.launcher property is passed on to the java application
934 FreeHeap(key); 932 FreeHeap(key);
1947 "error: +ExplictGCInvokesConcurrent[AndUnloadsClasses] conflicts" 1945 "error: +ExplictGCInvokesConcurrent[AndUnloadsClasses] conflicts"
1948 " with -UseAsyncConcMarkSweepGC"); 1946 " with -UseAsyncConcMarkSweepGC");
1949 status = false; 1947 status = false;
1950 } 1948 }
1951 1949
1950 #ifndef SERIALGC
1952 if (UseG1GC) { 1951 if (UseG1GC) {
1953 status = status && verify_percentage(InitiatingHeapOccupancyPercent, 1952 status = status && verify_percentage(InitiatingHeapOccupancyPercent,
1954 "InitiatingHeapOccupancyPercent"); 1953 "InitiatingHeapOccupancyPercent");
1955 } 1954 status = status && verify_min_value(G1RefProcDrainInterval, 1,
1955 "G1RefProcDrainInterval");
1956 status = status && verify_min_value((intx)G1ConcMarkStepDurationMillis, 1,
1957 "G1ConcMarkStepDurationMillis");
1958 }
1959 #endif
1956 1960
1957 status = status && verify_interval(RefDiscoveryPolicy, 1961 status = status && verify_interval(RefDiscoveryPolicy,
1958 ReferenceProcessor::DiscoveryPolicyMin, 1962 ReferenceProcessor::DiscoveryPolicyMin,
1959 ReferenceProcessor::DiscoveryPolicyMax, 1963 ReferenceProcessor::DiscoveryPolicyMax,
1960 "RefDiscoveryPolicy"); 1964 "RefDiscoveryPolicy");
3071 if (!FLAG_IS_DEFAULT(ScavengeRootsInCode)) { 3075 if (!FLAG_IS_DEFAULT(ScavengeRootsInCode)) {
3072 warning("forcing ScavengeRootsInCode non-zero because EnableMethodHandles or AnonymousClasses is true"); 3076 warning("forcing ScavengeRootsInCode non-zero because EnableMethodHandles or AnonymousClasses is true");
3073 } 3077 }
3074 ScavengeRootsInCode = 1; 3078 ScavengeRootsInCode = 1;
3075 } 3079 }
3076 #ifdef COMPILER2
3077 if (EnableInvokeDynamic && DoEscapeAnalysis) {
3078 // TODO: We need to find rules for invokedynamic and EA. For now,
3079 // simply disable EA by default.
3080 if (FLAG_IS_DEFAULT(DoEscapeAnalysis)) {
3081 DoEscapeAnalysis = false;
3082 }
3083 }
3084 #endif
3085 3080
3086 if (PrintGCDetails) { 3081 if (PrintGCDetails) {
3087 // Turn on -verbose:gc options as well 3082 // Turn on -verbose:gc options as well
3088 PrintGC = true; 3083 PrintGC = true;
3089 } 3084 }