diff options
| author | Andreas Gampe <agampe@google.com> | 2015-04-03 02:03:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-04-03 02:03:35 +0000 |
| commit | a68a7cf8f3a6fef22d71a14350176115cb13857f (patch) | |
| tree | dc3c80012c1bf13b68341e5ecf6c06684b7594f7 /runtime/runtime.h | |
| parent | fc2b49a544613a6cfc2328cde30eb1ec3c1a37c5 (diff) | |
| parent | f6a780abeaed4bf745720e8f836a3064d3ffbec4 (diff) | |
| download | android_art-a68a7cf8f3a6fef22d71a14350176115cb13857f.tar.gz android_art-a68a7cf8f3a6fef22d71a14350176115cb13857f.tar.bz2 android_art-a68a7cf8f3a6fef22d71a14350176115cb13857f.zip | |
Merge "ART: Move trace options to a struct"
Diffstat (limited to 'runtime/runtime.h')
| -rw-r--r-- | runtime/runtime.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/runtime/runtime.h b/runtime/runtime.h index 64b7183247..68458ae369 100644 --- a/runtime/runtime.h +++ b/runtime/runtime.h @@ -81,6 +81,7 @@ class StackOverflowHandler; class SuspensionHandler; class ThreadList; class Trace; +struct TraceConfig; class Transaction; typedef std::vector<std::pair<std::string, const void*>> RuntimeOptions; @@ -675,9 +676,8 @@ class Runtime { ProfilerOptions profiler_options_; bool profiler_started_; - bool method_trace_; - std::string method_trace_file_; - size_t method_trace_file_size_; + std::unique_ptr<TraceConfig> trace_config_; + instrumentation::Instrumentation instrumentation_; jobject main_thread_group_; |