mirror of
https://github.com/openjdk/jdk.git
synced 2025-09-16 17:14:41 +02:00
8133564: Runtime - 2nd followup to Validate JVM Command-Line Flag Arguments
Moved print function into JVMFlag, cleaned up include headers. Reviewed-by: coleenp, hseigel
This commit is contained in:
Gerard Ziemski
parent
4a8497acdb
commit
90cc14cd60
11 changed files with 392 additions and 406 deletions
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2015, 2018, 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,26 +26,24 @@
|
|||
#include "runtime/arguments.hpp"
|
||||
#include "runtime/flags/jvmFlag.hpp"
|
||||
#include "runtime/flags/jvmFlagConstraintsRuntime.hpp"
|
||||
#include "runtime/flags/jvmFlagRangeList.hpp"
|
||||
#include "runtime/globals.hpp"
|
||||
#include "runtime/safepointMechanism.hpp"
|
||||
#include "runtime/task.hpp"
|
||||
#include "utilities/defaultStream.hpp"
|
||||
|
||||
JVMFlag::Error ObjectAlignmentInBytesConstraintFunc(intx value, bool verbose) {
|
||||
if (!is_power_of_2(value)) {
|
||||
CommandLineError::print(verbose,
|
||||
"ObjectAlignmentInBytes (" INTX_FORMAT ") must be "
|
||||
"power of 2\n",
|
||||
value);
|
||||
JVMFlag::printError(verbose,
|
||||
"ObjectAlignmentInBytes (" INTX_FORMAT ") must be "
|
||||
"power of 2\n",
|
||||
value);
|
||||
return JVMFlag::VIOLATES_CONSTRAINT;
|
||||
}
|
||||
// In case page size is very small.
|
||||
if (value >= (intx)os::vm_page_size()) {
|
||||
CommandLineError::print(verbose,
|
||||
"ObjectAlignmentInBytes (" INTX_FORMAT ") must be "
|
||||
"less than page size (" INTX_FORMAT ")\n",
|
||||
value, (intx)os::vm_page_size());
|
||||
JVMFlag::printError(verbose,
|
||||
"ObjectAlignmentInBytes (" INTX_FORMAT ") must be "
|
||||
"less than page size (" INTX_FORMAT ")\n",
|
||||
value, (intx)os::vm_page_size());
|
||||
return JVMFlag::VIOLATES_CONSTRAINT;
|
||||
}
|
||||
return JVMFlag::SUCCESS;
|
||||
|
|
@ -55,10 +53,10 @@ JVMFlag::Error ObjectAlignmentInBytesConstraintFunc(intx value, bool verbose) {
|
|||
// It is sufficient to check against the largest type size.
|
||||
JVMFlag::Error ContendedPaddingWidthConstraintFunc(intx value, bool verbose) {
|
||||
if ((value % BytesPerLong) != 0) {
|
||||
CommandLineError::print(verbose,
|
||||
"ContendedPaddingWidth (" INTX_FORMAT ") must be "
|
||||
"a multiple of %d\n",
|
||||
value, BytesPerLong);
|
||||
JVMFlag::printError(verbose,
|
||||
"ContendedPaddingWidth (" INTX_FORMAT ") must be "
|
||||
"a multiple of %d\n",
|
||||
value, BytesPerLong);
|
||||
return JVMFlag::VIOLATES_CONSTRAINT;
|
||||
} else {
|
||||
return JVMFlag::SUCCESS;
|
||||
|
|
@ -67,10 +65,10 @@ JVMFlag::Error ContendedPaddingWidthConstraintFunc(intx value, bool verbose) {
|
|||
|
||||
JVMFlag::Error BiasedLockingBulkRebiasThresholdFunc(intx value, bool verbose) {
|
||||
if (value > BiasedLockingBulkRevokeThreshold) {
|
||||
CommandLineError::print(verbose,
|
||||
"BiasedLockingBulkRebiasThreshold (" INTX_FORMAT ") must be "
|
||||
"less than or equal to BiasedLockingBulkRevokeThreshold (" INTX_FORMAT ")\n",
|
||||
value, BiasedLockingBulkRevokeThreshold);
|
||||
JVMFlag::printError(verbose,
|
||||
"BiasedLockingBulkRebiasThreshold (" INTX_FORMAT ") must be "
|
||||
"less than or equal to BiasedLockingBulkRevokeThreshold (" INTX_FORMAT ")\n",
|
||||
value, BiasedLockingBulkRevokeThreshold);
|
||||
return JVMFlag::VIOLATES_CONSTRAINT;
|
||||
} else {
|
||||
return JVMFlag::SUCCESS;
|
||||
|
|
@ -79,10 +77,10 @@ JVMFlag::Error BiasedLockingBulkRebiasThresholdFunc(intx value, bool verbose) {
|
|||
|
||||
JVMFlag::Error BiasedLockingStartupDelayFunc(intx value, bool verbose) {
|
||||
if ((value % PeriodicTask::interval_gran) != 0) {
|
||||
CommandLineError::print(verbose,
|
||||
"BiasedLockingStartupDelay (" INTX_FORMAT ") must be "
|
||||
"evenly divisible by PeriodicTask::interval_gran (" INTX_FORMAT ")\n",
|
||||
value, PeriodicTask::interval_gran);
|
||||
JVMFlag::printError(verbose,
|
||||
"BiasedLockingStartupDelay (" INTX_FORMAT ") must be "
|
||||
"evenly divisible by PeriodicTask::interval_gran (" INTX_FORMAT ")\n",
|
||||
value, PeriodicTask::interval_gran);
|
||||
return JVMFlag::VIOLATES_CONSTRAINT;
|
||||
} else {
|
||||
return JVMFlag::SUCCESS;
|
||||
|
|
@ -91,17 +89,17 @@ JVMFlag::Error BiasedLockingStartupDelayFunc(intx value, bool verbose) {
|
|||
|
||||
JVMFlag::Error BiasedLockingBulkRevokeThresholdFunc(intx value, bool verbose) {
|
||||
if (value < BiasedLockingBulkRebiasThreshold) {
|
||||
CommandLineError::print(verbose,
|
||||
"BiasedLockingBulkRevokeThreshold (" INTX_FORMAT ") must be "
|
||||
"greater than or equal to BiasedLockingBulkRebiasThreshold (" INTX_FORMAT ")\n",
|
||||
value, BiasedLockingBulkRebiasThreshold);
|
||||
JVMFlag::printError(verbose,
|
||||
"BiasedLockingBulkRevokeThreshold (" INTX_FORMAT ") must be "
|
||||
"greater than or equal to BiasedLockingBulkRebiasThreshold (" INTX_FORMAT ")\n",
|
||||
value, BiasedLockingBulkRebiasThreshold);
|
||||
return JVMFlag::VIOLATES_CONSTRAINT;
|
||||
} else if ((double)value/(double)BiasedLockingDecayTime > 0.1) {
|
||||
CommandLineError::print(verbose,
|
||||
"The ratio of BiasedLockingBulkRevokeThreshold (" INTX_FORMAT ")"
|
||||
" to BiasedLockingDecayTime (" INTX_FORMAT ") must be "
|
||||
"less than or equal to 0.1\n",
|
||||
value, BiasedLockingBulkRebiasThreshold);
|
||||
JVMFlag::printError(verbose,
|
||||
"The ratio of BiasedLockingBulkRevokeThreshold (" INTX_FORMAT ")"
|
||||
" to BiasedLockingDecayTime (" INTX_FORMAT ") must be "
|
||||
"less than or equal to 0.1\n",
|
||||
value, BiasedLockingBulkRebiasThreshold);
|
||||
return JVMFlag::VIOLATES_CONSTRAINT;
|
||||
} else {
|
||||
return JVMFlag::SUCCESS;
|
||||
|
|
@ -110,11 +108,11 @@ JVMFlag::Error BiasedLockingBulkRevokeThresholdFunc(intx value, bool verbose) {
|
|||
|
||||
JVMFlag::Error BiasedLockingDecayTimeFunc(intx value, bool verbose) {
|
||||
if (BiasedLockingBulkRebiasThreshold/(double)value > 0.1) {
|
||||
CommandLineError::print(verbose,
|
||||
"The ratio of BiasedLockingBulkRebiasThreshold (" INTX_FORMAT ")"
|
||||
" to BiasedLockingDecayTime (" INTX_FORMAT ") must be "
|
||||
"less than or equal to 0.1\n",
|
||||
BiasedLockingBulkRebiasThreshold, value);
|
||||
JVMFlag::printError(verbose,
|
||||
"The ratio of BiasedLockingBulkRebiasThreshold (" INTX_FORMAT ")"
|
||||
" to BiasedLockingDecayTime (" INTX_FORMAT ") must be "
|
||||
"less than or equal to 0.1\n",
|
||||
BiasedLockingBulkRebiasThreshold, value);
|
||||
return JVMFlag::VIOLATES_CONSTRAINT;
|
||||
} else {
|
||||
return JVMFlag::SUCCESS;
|
||||
|
|
@ -123,10 +121,10 @@ JVMFlag::Error BiasedLockingDecayTimeFunc(intx value, bool verbose) {
|
|||
|
||||
JVMFlag::Error PerfDataSamplingIntervalFunc(intx value, bool verbose) {
|
||||
if ((value % PeriodicTask::interval_gran != 0)) {
|
||||
CommandLineError::print(verbose,
|
||||
"PerfDataSamplingInterval (" INTX_FORMAT ") must be "
|
||||
"evenly divisible by PeriodicTask::interval_gran (" INTX_FORMAT ")\n",
|
||||
value, PeriodicTask::interval_gran);
|
||||
JVMFlag::printError(verbose,
|
||||
"PerfDataSamplingInterval (" INTX_FORMAT ") must be "
|
||||
"evenly divisible by PeriodicTask::interval_gran (" INTX_FORMAT ")\n",
|
||||
value, PeriodicTask::interval_gran);
|
||||
return JVMFlag::VIOLATES_CONSTRAINT;
|
||||
} else {
|
||||
return JVMFlag::SUCCESS;
|
||||
|
|
@ -136,7 +134,7 @@ JVMFlag::Error PerfDataSamplingIntervalFunc(intx value, bool verbose) {
|
|||
JVMFlag::Error ThreadLocalHandshakesConstraintFunc(bool value, bool verbose) {
|
||||
if (value) {
|
||||
if (!SafepointMechanism::supports_thread_local_poll()) {
|
||||
CommandLineError::print(verbose, "ThreadLocalHandshakes not yet supported on this platform\n");
|
||||
JVMFlag::printError(verbose, "ThreadLocalHandshakes not yet supported on this platform\n");
|
||||
return JVMFlag::VIOLATES_CONSTRAINT;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue