diff options
author | Ian Rogers <irogers@google.com> | 2014-07-15 15:36:11 -0700 |
---|---|---|
committer | Ian Rogers <irogers@google.com> | 2014-07-15 17:07:49 -0700 |
commit | e63db27db913f1a88e2095a1ee8239b2bb9124e8 (patch) | |
tree | 893dee6783bca6717259321a6e4ba029c9c123e2 /runtime/runtime.cc | |
parent | 07b8441303ea82fca3cb85d71ecf8752d73cedd7 (diff) | |
download | art-e63db27db913f1a88e2095a1ee8239b2bb9124e8.zip art-e63db27db913f1a88e2095a1ee8239b2bb9124e8.tar.gz art-e63db27db913f1a88e2095a1ee8239b2bb9124e8.tar.bz2 |
Break apart header files.
Create libart-gtest for common runtime and compiler gtest routines.
Rename CompilerCallbacksImpl that is quick compiler specific.
Rename trace clock source constants to not use the overloaded profiler term.
Change-Id: I4aac4bdc7e7850c68335f81e59a390133b54e933
Diffstat (limited to 'runtime/runtime.cc')
-rw-r--r-- | runtime/runtime.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/runtime/runtime.cc b/runtime/runtime.cc index c354ad5..4cfd55e 100644 --- a/runtime/runtime.cc +++ b/runtime/runtime.cc @@ -49,6 +49,7 @@ #include "fault_handler.h" #include "gc/accounting/card_table-inl.h" #include "gc/heap.h" +#include "gc/space/image_space.h" #include "gc/space/space.h" #include "image.h" #include "instrumentation.h" @@ -324,7 +325,7 @@ void Runtime::SweepSystemWeaks(IsMarkedCallback* visitor, void* arg) { GetJavaVM()->SweepJniWeakGlobals(visitor, arg); } -bool Runtime::Create(const Options& options, bool ignore_unrecognized) { +bool Runtime::Create(const RuntimeOptions& options, bool ignore_unrecognized) { // TODO: acquire a static mutex on Runtime to avoid racing. if (Runtime::instance_ != NULL) { return false; @@ -534,7 +535,7 @@ void Runtime::StartDaemonThreads() { VLOG(startup) << "Runtime::StartDaemonThreads exiting"; } -bool Runtime::Init(const Options& raw_options, bool ignore_unrecognized) { +bool Runtime::Init(const RuntimeOptions& raw_options, bool ignore_unrecognized) { CHECK_EQ(sysconf(_SC_PAGE_SIZE), kPageSize); std::unique_ptr<ParsedOptions> options(ParsedOptions::Create(raw_options, ignore_unrecognized)); |