commit 5d84040e2231de1d48e6f30cab2cc8d4beb8effe
author jeffhao <jeffhao@google.com> Mon Oct 24 17:09:45 2011 -0700
committer jeffhao <jeffhao@google.com> Tue Oct 25 10:31:32 2011 -0700
tree 3d327896eef070328f4cb0adef0ebbc0b03d6370
parent 6b4ef025af12b158d117fc80fc79acf620f411a0

Created --runtime-arg switch for dex2oat to pass arguments to runtime.

This replaces the -Xms, -Xmx, and -verbose options.

Change-Id: Idc023b6d369bd8b5df932b9f2eb6dbc79d591ab1

src/class_linker.cc

diff --git a/src/class_linker.cc b/src/class_linker.cc
index afb6721..7c07f00 100644
--- a/src/class_linker.cc
+++ b/src/class_linker.cc
@@ -567,8 +567,8 @@
 
     execl("/system/bin/dex2oatd",
           "/system/bin/dex2oatd",
-          "-Xms64m",
-          "-Xmx64m",
+          "--runtime-arg", "-Xms64m",
+          "--runtime-arg", "-Xmx64m",
           boot_image_option.c_str(),
           dex_file_option.c_str(),
           oat_file_option.c_str(),

src/dex2oat.cc

diff --git a/src/dex2oat.cc b/src/dex2oat.cc
index 455b8b9..6a39241 100644
--- a/src/dex2oat.cc
+++ b/src/dex2oat.cc
@@ -52,14 +52,10 @@
           "      Example: --host-prefix=out/target/product/crespo\n"
           "\n");
   fprintf(stderr,
-          "  -Xms<n> may be used to specify an initial heap size for the runtime used to\n"
-          "      run dex2oat\n"
-          "      Example: -Xms256m\n"
-          "\n");
-  fprintf(stderr,
-          "  -Xmx<n> may be used to specify a maximum heap size for the runtime used to\n"
-          "      run dex2oat\n"
-          "      Example: -Xmx256m\n"
+          "  --runtime-arg <argument>: used to specify various arguments for the runtime,\n"
+          "      such as initial heap size, maximum heap size, and verbose output.\n"
+          "      Use a separate --runtime-arg switch for each argument.\n"
+          "      Example: --runtime-arg -Xms256m\n"
           "\n");
   exit(EXIT_FAILURE);
 }
@@ -81,9 +77,7 @@
   std::string boot_image_option;
   uintptr_t image_base = 0;
   std::string host_prefix;
-  const char* Xms = NULL;
-  const char* Xmx = NULL;
-  const char* verbose = NULL;
+  std::vector<const char*> runtime_args;
 
   for (int i = 0; i < argc; i++) {
     const StringPiece option(argv[i]);
@@ -113,12 +107,12 @@
       boot_image_option += boot_image_filename;
     } else if (option.starts_with("--host-prefix=")) {
       host_prefix = option.substr(strlen("--host-prefix=")).data();
-    } else if (option.starts_with("-Xms")) {
-      Xms = option.data();
-    } else if (option.starts_with("-Xmx")) {
-      Xmx = option.data();
-    } else if (option.starts_with("-verbose:")) {
-      verbose = option.data();
+    } else if (option == "--runtime-arg") {
+      if (++i >= argc) {
+        fprintf(stderr, "Missing required argument for --runtime-arg\n");
+        usage();
+      }
+      runtime_args.push_back(argv[i]);
     } else {
       fprintf(stderr, "unknown argument %s\n", option.data());
       usage();
@@ -161,18 +155,12 @@
   } else {
     options.push_back(std::make_pair(boot_image_option.c_str(), reinterpret_cast<void*>(NULL)));
   }
-  if (Xms != NULL) {
-    options.push_back(std::make_pair(Xms, reinterpret_cast<void*>(NULL)));
-  }
-  if (Xmx != NULL) {
-    options.push_back(std::make_pair(Xmx, reinterpret_cast<void*>(NULL)));
-  }
-  if (verbose != NULL) {
-    options.push_back(std::make_pair(verbose, reinterpret_cast<void*>(NULL)));
-  }
   if (!host_prefix.empty()) {
     options.push_back(std::make_pair("host-prefix", host_prefix.c_str()));
   }
+  for (size_t i = 0; i < runtime_args.size(); i++) {
+    options.push_back(std::make_pair(runtime_args[i], reinterpret_cast<void*>(NULL)));
+  }
   UniquePtr<Runtime> runtime(Runtime::Create(options, false));
   if (runtime.get() == NULL) {
     fprintf(stderr, "could not create runtime\n");

src/oatopt.cc

diff --git a/src/oatopt.cc b/src/oatopt.cc
index 133af59..c792b4d 100644
--- a/src/oatopt.cc
+++ b/src/oatopt.cc
@@ -51,8 +51,8 @@
 
   execl("/system/bin/dex2oatd",
         "/system/bin/dex2oatd",
-        "-Xms64m",
-        "-Xmx64m",
+        "--runtime-arg", "-Xms64m",
+        "--runtime-arg", "-Xmx64m",
         "--boot-image=/data/art-cache/boot.art",
         dex_file_option.c_str(),
         oat_file_option.c_str(),