equal
deleted
inserted
replaced
1 /* |
1 /* |
2 * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. |
2 * Copyright (c) 1997, 2015, 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. |
1520 #if !defined(COMPILER1) || defined(TIERED) |
1520 #if !defined(COMPILER1) || defined(TIERED) |
1521 if (FLAG_IS_DEFAULT(UseCompressedOops)) { |
1521 if (FLAG_IS_DEFAULT(UseCompressedOops)) { |
1522 FLAG_SET_ERGO(bool, UseCompressedOops, true); |
1522 FLAG_SET_ERGO(bool, UseCompressedOops, true); |
1523 } |
1523 } |
1524 #endif |
1524 #endif |
1525 #ifdef _WIN64 |
|
1526 if (UseLargePages && UseCompressedOops) { |
|
1527 // Cannot allocate guard pages for implicit checks in indexed addressing |
|
1528 // mode, when large pages are specified on windows. |
|
1529 // This flag could be switched ON if narrow oop base address is set to 0, |
|
1530 // see code in Universe::initialize_heap(). |
|
1531 Universe::set_narrow_oop_use_implicit_null_checks(false); |
|
1532 } |
|
1533 #endif // _WIN64 |
|
1534 } else { |
1525 } else { |
1535 if (UseCompressedOops && !FLAG_IS_DEFAULT(UseCompressedOops)) { |
1526 if (UseCompressedOops && !FLAG_IS_DEFAULT(UseCompressedOops)) { |
1536 warning("Max heap size too large for Compressed Oops"); |
1527 warning("Max heap size too large for Compressed Oops"); |
1537 FLAG_SET_DEFAULT(UseCompressedOops, false); |
1528 FLAG_SET_DEFAULT(UseCompressedOops, false); |
1538 FLAG_SET_DEFAULT(UseCompressedClassPointers, false); |
1529 FLAG_SET_DEFAULT(UseCompressedClassPointers, false); |
2414 |
2405 |
2415 status = status && verify_min_value(MarkSweepAlwaysCompactCount, 1, "MarkSweepAlwaysCompactCount"); |
2406 status = status && verify_min_value(MarkSweepAlwaysCompactCount, 1, "MarkSweepAlwaysCompactCount"); |
2416 #ifdef COMPILER1 |
2407 #ifdef COMPILER1 |
2417 status = status && verify_min_value(ValueMapInitialSize, 1, "ValueMapInitialSize"); |
2408 status = status && verify_min_value(ValueMapInitialSize, 1, "ValueMapInitialSize"); |
2418 #endif |
2409 #endif |
|
2410 status = status && verify_min_value(HeapSearchSteps, 1, "HeapSearchSteps"); |
2419 |
2411 |
2420 if (PrintNMTStatistics) { |
2412 if (PrintNMTStatistics) { |
2421 #if INCLUDE_NMT |
2413 #if INCLUDE_NMT |
2422 if (MemTracker::tracking_level() == NMT_off) { |
2414 if (MemTracker::tracking_level() == NMT_off) { |
2423 #endif // INCLUDE_NMT |
2415 #endif // INCLUDE_NMT |
4100 |
4092 |
4101 SystemProperty* new_p = new SystemProperty(k, v, true); |
4093 SystemProperty* new_p = new SystemProperty(k, v, true); |
4102 PropertyList_add(plist, new_p); |
4094 PropertyList_add(plist, new_p); |
4103 } |
4095 } |
4104 |
4096 |
|
4097 void Arguments::PropertyList_add(SystemProperty *element) { |
|
4098 PropertyList_add(&_system_properties, element); |
|
4099 } |
|
4100 |
4105 // This add maintains unique property key in the list. |
4101 // This add maintains unique property key in the list. |
4106 void Arguments::PropertyList_unique_add(SystemProperty** plist, const char* k, char* v, jboolean append) { |
4102 void Arguments::PropertyList_unique_add(SystemProperty** plist, const char* k, char* v, jboolean append) { |
4107 if (plist == NULL) |
4103 if (plist == NULL) |
4108 return; |
4104 return; |
4109 |
4105 |