Mercurial > hg > release > icedtea7-forest-2.2 > hotspot

changeset 3382:69333a2fbae2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7142680: default GC affected by jvm path Summary: Removed old tiered code Reviewed-by: never, kvn
author iveresov
date Wed, 15 Feb 2012 16:29:40 -0800
parents cfdfbeac0a5b
children fd8114661503
files src/share/vm/runtime/arguments.cpp
diffstat 1 files changed, 1 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/runtime/arguments.cpp	Wed Feb 15 12:32:03 2012 -0800
+++ b/src/share/vm/runtime/arguments.cpp	Wed Feb 15 16:29:40 2012 -0800
@@ -102,8 +102,6 @@
 char* Arguments::_meta_index_path = NULL;
 char* Arguments::_meta_index_dir = NULL;
 
-static bool force_client_mode = false;
-
 // Check if head of 'option' matches 'name', and sets 'tail' remaining part of option string
 
 static bool match_option(const JavaVMOption *option, const char* name,
@@ -1345,7 +1343,7 @@
     return;
   }
 
-  if (os::is_server_class_machine() && !force_client_mode ) {
+  if (os::is_server_class_machine()) {
     // If no other collector is requested explicitly,
     // let the VM select the collector based on
     // machine class and automatic selection policy.
@@ -2940,11 +2938,6 @@
   // Construct the path to the archive
   char jvm_path[JVM_MAXPATHLEN];
   os::jvm_path(jvm_path, sizeof(jvm_path));
-#ifdef TIERED
-  if (strstr(jvm_path, "client") != NULL) {
-    force_client_mode = true;
-  }
-#endif // TIERED
   char *end = strrchr(jvm_path, *os::file_separator());
   if (end != NULL) *end = '\0';
   char *shared_archive_path = NEW_C_HEAP_ARRAY(char, strlen(jvm_path) +