diff options
| author | Andreas Gampe <agampe@google.com> | 2017-04-12 00:03:47 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-04-12 00:03:47 +0000 |
| commit | 7a689c2bb1535f834547644d96089d467cc901b5 (patch) | |
| tree | 40428c689271559eab170b9299caa6865cc5caec | |
| parent | 0ceb62c0ee8320c259604cece56d0c6167d38cc3 (diff) | |
| parent | 4b2e765b4072151ff3ba5fc3bf835a326533ebef (diff) | |
Merge changes Ib29b3920,Ice5efad9 am: ea07a65281
am: 4b2e765b40
Change-Id: Id6e7f57c04461f279eea0da7b67e2f5fb1fbc221
| -rw-r--r-- | cmdline/cmdline_parser_test.cc | 7 | ||||
| -rw-r--r-- | cmdline/cmdline_types.h | 2 | ||||
| -rw-r--r-- | runtime/base/logging.h | 1 | ||||
| -rw-r--r-- | runtime/entrypoints/quick/quick_trampoline_entrypoints.cc | 2 |
4 files changed, 11 insertions, 1 deletions
diff --git a/cmdline/cmdline_parser_test.cc b/cmdline/cmdline_parser_test.cc index 5b331bcbec3..1a2b9cde67d 100644 --- a/cmdline/cmdline_parser_test.cc +++ b/cmdline/cmdline_parser_test.cc @@ -300,6 +300,13 @@ TEST_F(CmdlineParserTest, TestLogVerbosity) { log_verbosity.oat = true; EXPECT_SINGLE_PARSE_VALUE(log_verbosity, log_args, M::Verbose); } + + { + const char* log_args = "-verbose:dex"; + LogVerbosity log_verbosity = LogVerbosity(); + log_verbosity.dex = true; + EXPECT_SINGLE_PARSE_VALUE(log_verbosity, log_args, M::Verbose); + } } // TEST_F // TODO: Enable this b/19274810 diff --git a/cmdline/cmdline_types.h b/cmdline/cmdline_types.h index cd19fa415c9..e33a2070dd4 100644 --- a/cmdline/cmdline_types.h +++ b/cmdline/cmdline_types.h @@ -656,6 +656,8 @@ struct CmdlineType<LogVerbosity> : CmdlineTypeParser<LogVerbosity> { log_verbosity.systrace_lock_logging = true; } else if (verbose_options[j] == "agents") { log_verbosity.agents = true; + } else if (verbose_options[j] == "dex") { + log_verbosity.dex = true; } else { return Result::Usage(std::string("Unknown -verbose option ") + verbose_options[j]); } diff --git a/runtime/base/logging.h b/runtime/base/logging.h index a173ac2d4d7..7a9184e07ef 100644 --- a/runtime/base/logging.h +++ b/runtime/base/logging.h @@ -56,6 +56,7 @@ struct LogVerbosity { bool image; bool systrace_lock_logging; // Enabled with "-verbose:sys-locks". bool agents; + bool dex; // Some dex access output etc. }; // Global log verbosity setting, initialized by InitLogging. diff --git a/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc b/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc index 25073a8b794..354ae205e8d 100644 --- a/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc +++ b/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc @@ -1075,7 +1075,7 @@ extern "C" const void* artQuickResolutionTrampoline( << called_method.dex_file->PrettyMethod(called_method.dex_method_index); } } else { - VLOG(oat) << "Accessed dex file for invoke " << invoke_type << " " + VLOG(dex) << "Accessed dex file for invoke " << invoke_type << " " << called_method.dex_method_index; } } else { |