src/share/vm/runtime/globals_extension.hpp
Index Unified diffs Context diffs Sdiffs Wdiffs Patch New Old Previous File Next File 8059557_open Cdiff src/share/vm/runtime/globals_extension.hpp

src/share/vm/runtime/globals_extension.hpp

Print this page

        

*** 1,7 **** /* ! * Copyright (c) 2003, 2013, 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 * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. --- 1,7 ---- /* ! * Copyright (c) 2003, 2015, 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 * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation.
*** 70,91 **** #define ARCH_EXPERIMENTAL_FLAG_MEMBER(type, name, value, doc) FLAG_MEMBER(name), #define ARCH_DEVELOP_FLAG_MEMBER(type, name, value, doc) FLAG_MEMBER(name), #define ARCH_NOTPRODUCT_FLAG_MEMBER(type, name, value, doc) FLAG_MEMBER(name), typedef enum { ! RUNTIME_FLAGS(RUNTIME_DEVELOP_FLAG_MEMBER, RUNTIME_PD_DEVELOP_FLAG_MEMBER, RUNTIME_PRODUCT_FLAG_MEMBER, RUNTIME_PD_PRODUCT_FLAG_MEMBER, RUNTIME_DIAGNOSTIC_FLAG_MEMBER, RUNTIME_EXPERIMENTAL_FLAG_MEMBER, RUNTIME_NOTPRODUCT_FLAG_MEMBER, RUNTIME_MANAGEABLE_FLAG_MEMBER, RUNTIME_PRODUCT_RW_FLAG_MEMBER, RUNTIME_LP64_PRODUCT_FLAG_MEMBER) ! RUNTIME_OS_FLAGS(RUNTIME_DEVELOP_FLAG_MEMBER, RUNTIME_PD_DEVELOP_FLAG_MEMBER, RUNTIME_PRODUCT_FLAG_MEMBER, RUNTIME_PD_PRODUCT_FLAG_MEMBER, RUNTIME_DIAGNOSTIC_FLAG_MEMBER, RUNTIME_NOTPRODUCT_FLAG_MEMBER) #if INCLUDE_ALL_GCS ! G1_FLAGS(RUNTIME_DEVELOP_FLAG_MEMBER, RUNTIME_PD_DEVELOP_FLAG_MEMBER, RUNTIME_PRODUCT_FLAG_MEMBER, RUNTIME_PD_PRODUCT_FLAG_MEMBER, RUNTIME_DIAGNOSTIC_FLAG_MEMBER, RUNTIME_EXPERIMENTAL_FLAG_MEMBER, RUNTIME_NOTPRODUCT_FLAG_MEMBER, RUNTIME_MANAGEABLE_FLAG_MEMBER, RUNTIME_PRODUCT_RW_FLAG_MEMBER) #endif // INCLUDE_ALL_GCS #ifdef COMPILER1 ! C1_FLAGS(C1_DEVELOP_FLAG_MEMBER, C1_PD_DEVELOP_FLAG_MEMBER, C1_PRODUCT_FLAG_MEMBER, C1_PD_PRODUCT_FLAG_MEMBER, C1_DIAGNOSTIC_FLAG_MEMBER, C1_NOTPRODUCT_FLAG_MEMBER) #endif #ifdef COMPILER2 ! C2_FLAGS(C2_DEVELOP_FLAG_MEMBER, C2_PD_DEVELOP_FLAG_MEMBER, C2_PRODUCT_FLAG_MEMBER, C2_PD_PRODUCT_FLAG_MEMBER, C2_DIAGNOSTIC_FLAG_MEMBER, C2_EXPERIMENTAL_FLAG_MEMBER, C2_NOTPRODUCT_FLAG_MEMBER) #endif ! ARCH_FLAGS(ARCH_DEVELOP_FLAG_MEMBER, ARCH_PRODUCT_FLAG_MEMBER, ARCH_DIAGNOSTIC_FLAG_MEMBER, ARCH_EXPERIMENTAL_FLAG_MEMBER, ARCH_NOTPRODUCT_FLAG_MEMBER) COMMANDLINEFLAG_EXT NUM_CommandLineFlag } CommandLineFlag; // Construct enum of Flag_<cmdline-arg>_<type> constants. --- 70,140 ---- #define ARCH_EXPERIMENTAL_FLAG_MEMBER(type, name, value, doc) FLAG_MEMBER(name), #define ARCH_DEVELOP_FLAG_MEMBER(type, name, value, doc) FLAG_MEMBER(name), #define ARCH_NOTPRODUCT_FLAG_MEMBER(type, name, value, doc) FLAG_MEMBER(name), typedef enum { ! RUNTIME_FLAGS(RUNTIME_DEVELOP_FLAG_MEMBER, \ ! RUNTIME_PD_DEVELOP_FLAG_MEMBER, \ ! RUNTIME_PRODUCT_FLAG_MEMBER, \ ! RUNTIME_PD_PRODUCT_FLAG_MEMBER, \ ! RUNTIME_DIAGNOSTIC_FLAG_MEMBER, \ ! RUNTIME_EXPERIMENTAL_FLAG_MEMBER, \ ! RUNTIME_NOTPRODUCT_FLAG_MEMBER, \ ! RUNTIME_MANAGEABLE_FLAG_MEMBER, \ ! RUNTIME_PRODUCT_RW_FLAG_MEMBER, \ ! RUNTIME_LP64_PRODUCT_FLAG_MEMBER, \ ! IGNORE_RANGE, \ ! IGNORE_CONSTRAINT) ! RUNTIME_OS_FLAGS(RUNTIME_DEVELOP_FLAG_MEMBER, \ ! RUNTIME_PD_DEVELOP_FLAG_MEMBER, \ ! RUNTIME_PRODUCT_FLAG_MEMBER, \ ! RUNTIME_PD_PRODUCT_FLAG_MEMBER, \ ! RUNTIME_DIAGNOSTIC_FLAG_MEMBER, \ ! RUNTIME_NOTPRODUCT_FLAG_MEMBER, \ ! IGNORE_RANGE, \ ! IGNORE_CONSTRAINT) #if INCLUDE_ALL_GCS ! G1_FLAGS(RUNTIME_DEVELOP_FLAG_MEMBER, \ ! RUNTIME_PD_DEVELOP_FLAG_MEMBER, \ ! RUNTIME_PRODUCT_FLAG_MEMBER, \ ! RUNTIME_PD_PRODUCT_FLAG_MEMBER, \ ! RUNTIME_DIAGNOSTIC_FLAG_MEMBER, \ ! RUNTIME_EXPERIMENTAL_FLAG_MEMBER, \ ! RUNTIME_NOTPRODUCT_FLAG_MEMBER, \ ! RUNTIME_MANAGEABLE_FLAG_MEMBER, \ ! RUNTIME_PRODUCT_RW_FLAG_MEMBER, \ ! IGNORE_RANGE, \ ! IGNORE_CONSTRAINT) #endif // INCLUDE_ALL_GCS #ifdef COMPILER1 ! C1_FLAGS(C1_DEVELOP_FLAG_MEMBER, \ ! C1_PD_DEVELOP_FLAG_MEMBER, \ ! C1_PRODUCT_FLAG_MEMBER, \ ! C1_PD_PRODUCT_FLAG_MEMBER, \ ! C1_DIAGNOSTIC_FLAG_MEMBER, \ ! C1_NOTPRODUCT_FLAG_MEMBER, \ ! IGNORE_RANGE, \ ! IGNORE_CONSTRAINT) #endif #ifdef COMPILER2 ! C2_FLAGS(C2_DEVELOP_FLAG_MEMBER, \ ! C2_PD_DEVELOP_FLAG_MEMBER, \ ! C2_PRODUCT_FLAG_MEMBER, \ ! C2_PD_PRODUCT_FLAG_MEMBER, \ ! C2_DIAGNOSTIC_FLAG_MEMBER, \ ! C2_EXPERIMENTAL_FLAG_MEMBER, \ ! C2_NOTPRODUCT_FLAG_MEMBER, \ ! IGNORE_RANGE, \ ! IGNORE_CONSTRAINT) #endif ! ARCH_FLAGS(ARCH_DEVELOP_FLAG_MEMBER, \ ! ARCH_PRODUCT_FLAG_MEMBER, \ ! ARCH_DIAGNOSTIC_FLAG_MEMBER, \ ! ARCH_EXPERIMENTAL_FLAG_MEMBER, \ ! ARCH_NOTPRODUCT_FLAG_MEMBER, \ ! IGNORE_RANGE, \ ! IGNORE_CONSTRAINT) COMMANDLINEFLAG_EXT NUM_CommandLineFlag } CommandLineFlag; // Construct enum of Flag_<cmdline-arg>_<type> constants.
*** 137,186 **** RUNTIME_DIAGNOSTIC_FLAG_MEMBER_WITH_TYPE, RUNTIME_EXPERIMENTAL_FLAG_MEMBER_WITH_TYPE, RUNTIME_NOTPRODUCT_FLAG_MEMBER_WITH_TYPE, RUNTIME_MANAGEABLE_FLAG_MEMBER_WITH_TYPE, RUNTIME_PRODUCT_RW_FLAG_MEMBER_WITH_TYPE, ! RUNTIME_LP64_PRODUCT_FLAG_MEMBER_WITH_TYPE) RUNTIME_OS_FLAGS(RUNTIME_DEVELOP_FLAG_MEMBER_WITH_TYPE, RUNTIME_PD_DEVELOP_FLAG_MEMBER_WITH_TYPE, RUNTIME_PRODUCT_FLAG_MEMBER_WITH_TYPE, RUNTIME_PD_PRODUCT_FLAG_MEMBER_WITH_TYPE, RUNTIME_DIAGNOSTIC_FLAG_MEMBER_WITH_TYPE, ! RUNTIME_NOTPRODUCT_FLAG_MEMBER_WITH_TYPE) #if INCLUDE_ALL_GCS G1_FLAGS(RUNTIME_DEVELOP_FLAG_MEMBER_WITH_TYPE, RUNTIME_PD_DEVELOP_FLAG_MEMBER_WITH_TYPE, RUNTIME_PRODUCT_FLAG_MEMBER_WITH_TYPE, RUNTIME_PD_PRODUCT_FLAG_MEMBER_WITH_TYPE, RUNTIME_DIAGNOSTIC_FLAG_MEMBER_WITH_TYPE, RUNTIME_EXPERIMENTAL_FLAG_MEMBER_WITH_TYPE, RUNTIME_NOTPRODUCT_FLAG_MEMBER_WITH_TYPE, RUNTIME_MANAGEABLE_FLAG_MEMBER_WITH_TYPE, ! RUNTIME_PRODUCT_RW_FLAG_MEMBER_WITH_TYPE) #endif // INCLUDE_ALL_GCS #ifdef COMPILER1 C1_FLAGS(C1_DEVELOP_FLAG_MEMBER_WITH_TYPE, C1_PD_DEVELOP_FLAG_MEMBER_WITH_TYPE, C1_PRODUCT_FLAG_MEMBER_WITH_TYPE, C1_PD_PRODUCT_FLAG_MEMBER_WITH_TYPE, C1_DIAGNOSTIC_FLAG_MEMBER_WITH_TYPE, ! C1_NOTPRODUCT_FLAG_MEMBER_WITH_TYPE) #endif #ifdef COMPILER2 C2_FLAGS(C2_DEVELOP_FLAG_MEMBER_WITH_TYPE, C2_PD_DEVELOP_FLAG_MEMBER_WITH_TYPE, C2_PRODUCT_FLAG_MEMBER_WITH_TYPE, C2_PD_PRODUCT_FLAG_MEMBER_WITH_TYPE, C2_DIAGNOSTIC_FLAG_MEMBER_WITH_TYPE, C2_EXPERIMENTAL_FLAG_MEMBER_WITH_TYPE, ! C2_NOTPRODUCT_FLAG_MEMBER_WITH_TYPE) #endif ARCH_FLAGS(ARCH_DEVELOP_FLAG_MEMBER_WITH_TYPE, ARCH_PRODUCT_FLAG_MEMBER_WITH_TYPE, ARCH_DIAGNOSTIC_FLAG_MEMBER_WITH_TYPE, ARCH_EXPERIMENTAL_FLAG_MEMBER_WITH_TYPE, ! ARCH_NOTPRODUCT_FLAG_MEMBER_WITH_TYPE) COMMANDLINEFLAGWITHTYPE_EXT NUM_CommandLineFlagWithType } CommandLineFlagWithType; #define FLAG_IS_DEFAULT(name) (CommandLineFlagsEx::is_default(FLAG_MEMBER(name))) --- 186,247 ---- RUNTIME_DIAGNOSTIC_FLAG_MEMBER_WITH_TYPE, RUNTIME_EXPERIMENTAL_FLAG_MEMBER_WITH_TYPE, RUNTIME_NOTPRODUCT_FLAG_MEMBER_WITH_TYPE, RUNTIME_MANAGEABLE_FLAG_MEMBER_WITH_TYPE, RUNTIME_PRODUCT_RW_FLAG_MEMBER_WITH_TYPE, ! RUNTIME_LP64_PRODUCT_FLAG_MEMBER_WITH_TYPE, ! IGNORE_RANGE, ! IGNORE_CONSTRAINT) RUNTIME_OS_FLAGS(RUNTIME_DEVELOP_FLAG_MEMBER_WITH_TYPE, RUNTIME_PD_DEVELOP_FLAG_MEMBER_WITH_TYPE, RUNTIME_PRODUCT_FLAG_MEMBER_WITH_TYPE, RUNTIME_PD_PRODUCT_FLAG_MEMBER_WITH_TYPE, RUNTIME_DIAGNOSTIC_FLAG_MEMBER_WITH_TYPE, ! RUNTIME_NOTPRODUCT_FLAG_MEMBER_WITH_TYPE, ! IGNORE_RANGE, ! IGNORE_CONSTRAINT) #if INCLUDE_ALL_GCS G1_FLAGS(RUNTIME_DEVELOP_FLAG_MEMBER_WITH_TYPE, RUNTIME_PD_DEVELOP_FLAG_MEMBER_WITH_TYPE, RUNTIME_PRODUCT_FLAG_MEMBER_WITH_TYPE, RUNTIME_PD_PRODUCT_FLAG_MEMBER_WITH_TYPE, RUNTIME_DIAGNOSTIC_FLAG_MEMBER_WITH_TYPE, RUNTIME_EXPERIMENTAL_FLAG_MEMBER_WITH_TYPE, RUNTIME_NOTPRODUCT_FLAG_MEMBER_WITH_TYPE, RUNTIME_MANAGEABLE_FLAG_MEMBER_WITH_TYPE, ! RUNTIME_PRODUCT_RW_FLAG_MEMBER_WITH_TYPE, ! IGNORE_RANGE, ! IGNORE_CONSTRAINT) #endif // INCLUDE_ALL_GCS #ifdef COMPILER1 C1_FLAGS(C1_DEVELOP_FLAG_MEMBER_WITH_TYPE, C1_PD_DEVELOP_FLAG_MEMBER_WITH_TYPE, C1_PRODUCT_FLAG_MEMBER_WITH_TYPE, C1_PD_PRODUCT_FLAG_MEMBER_WITH_TYPE, C1_DIAGNOSTIC_FLAG_MEMBER_WITH_TYPE, ! C1_NOTPRODUCT_FLAG_MEMBER_WITH_TYPE, ! IGNORE_RANGE, ! IGNORE_CONSTRAINT) #endif #ifdef COMPILER2 C2_FLAGS(C2_DEVELOP_FLAG_MEMBER_WITH_TYPE, C2_PD_DEVELOP_FLAG_MEMBER_WITH_TYPE, C2_PRODUCT_FLAG_MEMBER_WITH_TYPE, C2_PD_PRODUCT_FLAG_MEMBER_WITH_TYPE, C2_DIAGNOSTIC_FLAG_MEMBER_WITH_TYPE, C2_EXPERIMENTAL_FLAG_MEMBER_WITH_TYPE, ! C2_NOTPRODUCT_FLAG_MEMBER_WITH_TYPE, ! IGNORE_RANGE, ! IGNORE_CONSTRAINT) #endif ARCH_FLAGS(ARCH_DEVELOP_FLAG_MEMBER_WITH_TYPE, ARCH_PRODUCT_FLAG_MEMBER_WITH_TYPE, ARCH_DIAGNOSTIC_FLAG_MEMBER_WITH_TYPE, ARCH_EXPERIMENTAL_FLAG_MEMBER_WITH_TYPE, ! ARCH_NOTPRODUCT_FLAG_MEMBER_WITH_TYPE, ! IGNORE_RANGE, ! IGNORE_CONSTRAINT) COMMANDLINEFLAGWITHTYPE_EXT NUM_CommandLineFlagWithType } CommandLineFlagWithType; #define FLAG_IS_DEFAULT(name) (CommandLineFlagsEx::is_default(FLAG_MEMBER(name)))
*** 194,213 **** // Can't put the following in CommandLineFlags because // of a circular dependency on the enum definition. class CommandLineFlagsEx : CommandLineFlags { public: ! static void boolAtPut(CommandLineFlagWithType flag, bool value, Flag::Flags origin); ! static void intAtPut(CommandLineFlagWithType flag, int value, Flag::Flags origin); ! static void uintAtPut(CommandLineFlagWithType flag, uint value, Flag::Flags origin); ! static void intxAtPut(CommandLineFlagWithType flag, intx value, Flag::Flags origin); ! static void uintxAtPut(CommandLineFlagWithType flag, uintx value, Flag::Flags origin); ! static void uint64_tAtPut(CommandLineFlagWithType flag, uint64_t value, Flag::Flags origin); ! static void size_tAtPut(CommandLineFlagWithType flag, size_t value, Flag::Flags origin); ! static void doubleAtPut(CommandLineFlagWithType flag, double value, Flag::Flags origin); // Contract: Flag will make private copy of the incoming value ! static void ccstrAtPut(CommandLineFlagWithType flag, ccstr value, Flag::Flags origin); static bool is_default(CommandLineFlag flag); static bool is_ergo(CommandLineFlag flag); static bool is_cmdline(CommandLineFlag flag); }; --- 255,274 ---- // Can't put the following in CommandLineFlags because // of a circular dependency on the enum definition. class CommandLineFlagsEx : CommandLineFlags { public: ! static Flag::Error boolAtPut(CommandLineFlagWithType flag, bool value, Flag::Flags origin); ! static Flag::Error intAtPut(CommandLineFlagWithType flag, int value, Flag::Flags origin); ! static Flag::Error uintAtPut(CommandLineFlagWithType flag, uint value, Flag::Flags origin); ! static Flag::Error intxAtPut(CommandLineFlagWithType flag, intx value, Flag::Flags origin); ! static Flag::Error uintxAtPut(CommandLineFlagWithType flag, uintx value, Flag::Flags origin); ! static Flag::Error uint64_tAtPut(CommandLineFlagWithType flag, uint64_t value, Flag::Flags origin); ! static Flag::Error size_tAtPut(CommandLineFlagWithType flag, size_t value, Flag::Flags origin); ! static Flag::Error doubleAtPut(CommandLineFlagWithType flag, double value, Flag::Flags origin); // Contract: Flag will make private copy of the incoming value ! static Flag::Error ccstrAtPut(CommandLineFlagWithType flag, ccstr value, Flag::Flags origin); static bool is_default(CommandLineFlag flag); static bool is_ergo(CommandLineFlag flag); static bool is_cmdline(CommandLineFlag flag); };
src/share/vm/runtime/globals_extension.hpp
Index Unified diffs Context diffs Sdiffs Wdiffs Patch New Old Previous File Next File