Print this page


Split Close
Expand all
Collapse all
          --- old/src/share/vm/runtime/arguments.cpp
          +++ new/src/share/vm/runtime/arguments.cpp
↓ open down ↓ 94 lines elided ↑ open up ↑
  95   95  SystemProperty *Arguments::_java_endorsed_dirs = NULL;
  96   96  SystemProperty *Arguments::_sun_boot_library_path = NULL;
  97   97  SystemProperty *Arguments::_java_library_path = NULL;
  98   98  SystemProperty *Arguments::_java_home = NULL;
  99   99  SystemProperty *Arguments::_java_class_path = NULL;
 100  100  SystemProperty *Arguments::_sun_boot_class_path = NULL;
 101  101  
 102  102  char* Arguments::_meta_index_path = NULL;
 103  103  char* Arguments::_meta_index_dir = NULL;
 104  104  
 105      -static bool force_client_mode = false;
 106      -
 107  105  // Check if head of 'option' matches 'name', and sets 'tail' remaining part of option string
 108  106  
 109  107  static bool match_option(const JavaVMOption *option, const char* name,
 110  108                           const char** tail) {
 111  109    int len = (int)strlen(name);
 112  110    if (strncmp(option->optionString, name, len) == 0) {
 113  111      *tail = option->optionString + len;
 114  112      return true;
 115  113    } else {
 116  114      return false;
↓ open down ↓ 1221 lines elided ↑ open up ↑
1338 1336    return false;
1339 1337  }
1340 1338  
1341 1339  void Arguments::set_ergonomics_flags() {
1342 1340    // Parallel GC is not compatible with sharing. If one specifies
1343 1341    // that they want sharing explicitly, do not set ergonomics flags.
1344 1342    if (DumpSharedSpaces || RequireSharedSpaces) {
1345 1343      return;
1346 1344    }
1347 1345  
1348      -  if (os::is_server_class_machine() && !force_client_mode ) {
     1346 +  if (os::is_server_class_machine()) {
1349 1347      // If no other collector is requested explicitly,
1350 1348      // let the VM select the collector based on
1351 1349      // machine class and automatic selection policy.
1352 1350      if (!UseSerialGC &&
1353 1351          !UseConcMarkSweepGC &&
1354 1352          !UseG1GC &&
1355 1353          !UseParNewGC &&
1356 1354          !DumpSharedSpaces &&
1357 1355          FLAG_IS_DEFAULT(UseParallelGC)) {
1358 1356        if (should_auto_select_low_pause_collector()) {
↓ open down ↓ 1574 lines elided ↑ open up ↑
2933 2931  } while(0)
2934 2932  
2935 2933  // Parse entry point called from JNI_CreateJavaVM
2936 2934  
2937 2935  jint Arguments::parse(const JavaVMInitArgs* args) {
2938 2936  
2939 2937    // Sharing support
2940 2938    // Construct the path to the archive
2941 2939    char jvm_path[JVM_MAXPATHLEN];
2942 2940    os::jvm_path(jvm_path, sizeof(jvm_path));
2943      -#ifdef TIERED
2944      -  if (strstr(jvm_path, "client") != NULL) {
2945      -    force_client_mode = true;
2946      -  }
2947      -#endif // TIERED
2948 2941    char *end = strrchr(jvm_path, *os::file_separator());
2949 2942    if (end != NULL) *end = '\0';
2950 2943    char *shared_archive_path = NEW_C_HEAP_ARRAY(char, strlen(jvm_path) +
2951 2944                                          strlen(os::file_separator()) + 20);
2952 2945    if (shared_archive_path == NULL) return JNI_ENOMEM;
2953 2946    strcpy(shared_archive_path, jvm_path);
2954 2947    strcat(shared_archive_path, os::file_separator());
2955 2948    strcat(shared_archive_path, "classes");
2956 2949    DEBUG_ONLY(strcat(shared_archive_path, "_g");)
2957 2950    strcat(shared_archive_path, ".jsa");
↓ open down ↓ 428 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX