diff options
| author | Calin Juravle <calin@google.com> | 2014-04-08 13:37:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-04-08 13:37:28 +0000 |
| commit | a704644079945c700bef37803b3b7bcd70a10cb4 (patch) | |
| tree | a02af06fa8833288d3711153a82161a2aeef9e8a /runtime/runtime.cc | |
| parent | 2be6fc74bce10ac68d3d1b39a5019f520ad170ea (diff) | |
| parent | 1659006728b929aa820d09bdaba58b462cc8e7cc (diff) | |
| download | art-a704644079945c700bef37803b3b7bcd70a10cb4.zip art-a704644079945c700bef37803b3b7bcd70a10cb4.tar.gz art-a704644079945c700bef37803b3b7bcd70a10cb4.tar.bz2 | |
Merge "Profile: made startImmediately settable"
Diffstat (limited to 'runtime/runtime.cc')
| -rw-r--r-- | runtime/runtime.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/runtime/runtime.cc b/runtime/runtime.cc index edc3b33..a19fa53 100644 --- a/runtime/runtime.cc +++ b/runtime/runtime.cc @@ -121,6 +121,7 @@ Runtime::Runtime() profile_duration_s_(0), profile_interval_us_(0), profile_backoff_coefficient_(0), + profile_start_immediately_(true), method_trace_(false), method_trace_file_size_(0), instrumentation_(), @@ -391,7 +392,7 @@ bool Runtime::Start() { if (fd >= 0) { close(fd); } - StartProfiler(profile_output_filename_.c_str(), "", true); + StartProfiler(profile_output_filename_.c_str(), ""); } return true; @@ -616,6 +617,7 @@ bool Runtime::Init(const Options& raw_options, bool ignore_unrecognized) { profile_duration_s_ = options->profile_duration_s_; profile_interval_us_ = options->profile_interval_us_; profile_backoff_coefficient_ = options->profile_backoff_coefficient_; + profile_start_immediately_ = options->profile_start_immediately_; profile_ = options->profile_; profile_output_filename_ = options->profile_output_filename_; // TODO: move this to just be an Trace::Start argument @@ -1143,10 +1145,9 @@ void Runtime::RemoveMethodVerifier(verifier::MethodVerifier* verifier) { method_verifiers_.erase(it); } -void Runtime::StartProfiler(const char* appDir, const char* procName, bool startImmediately) { +void Runtime::StartProfiler(const char* appDir, const char* procName) { BackgroundMethodSamplingProfiler::Start(profile_period_s_, profile_duration_s_, appDir, - procName, profile_interval_us_, - profile_backoff_coefficient_, startImmediately); + procName, profile_interval_us_, profile_backoff_coefficient_, profile_start_immediately_); } // Transaction support. |