diff options
| author | Ian Rogers <irogers@google.com> | 2013-11-14 00:17:20 -0800 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2013-11-14 14:59:57 -0800 |
| commit | 5fe9af720048673e62ee29597a30bb9e54c903c5 (patch) | |
| tree | 733dca70511f4798a3082b084a9a3d6da9f5914a /dex2oat | |
| parent | dfe78a6e6b526d482298100a1f6392a8c7105522 (diff) | |
| download | art-5fe9af720048673e62ee29597a30bb9e54c903c5.zip art-5fe9af720048673e62ee29597a30bb9e54c903c5.tar.gz art-5fe9af720048673e62ee29597a30bb9e54c903c5.tar.bz2 | |
Fix memory leaks relating to timing logger.
Bug: 11670287.
We use pointers to uninitialized values for control-flow in the timing logger
code, add TODO comments to clean this up later.
Remove base namespace and other bits of tidying.
Change-Id: I1e6600a1e92f974c8f58f3a405a4e4abb4d9f80f
Diffstat (limited to 'dex2oat')
| -rw-r--r-- | dex2oat/dex2oat.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/dex2oat/dex2oat.cc b/dex2oat/dex2oat.cc index 3781921..fada66a 100644 --- a/dex2oat/dex2oat.cc +++ b/dex2oat/dex2oat.cc @@ -242,7 +242,7 @@ class Dex2Oat { bool image, UniquePtr<CompilerDriver::DescriptorSet>& image_classes, bool dump_stats, - base::TimingLogger& timings) { + TimingLogger& timings) { // SirtRef and ClassLoader creation needs to come after Runtime::Create jobject class_loader = NULL; Thread* self = Thread::Current(); @@ -600,7 +600,7 @@ static InstructionSetFeatures ParseFeatureList(std::string str) { } static int dex2oat(int argc, char** argv) { - base::TimingLogger timings("compiler", false, false); + TimingLogger timings("compiler", false, false); InitLogging(argv); @@ -1091,7 +1091,7 @@ static int dex2oat(int argc, char** argv) { if (is_host) { if (dump_timing || (dump_slow_timing && timings.GetTotalNs() > MsToNs(1000))) { - LOG(INFO) << Dumpable<base::TimingLogger>(timings); + LOG(INFO) << Dumpable<TimingLogger>(timings); } return EXIT_SUCCESS; } @@ -1133,7 +1133,7 @@ static int dex2oat(int argc, char** argv) { timings.EndSplit(); if (dump_timing || (dump_slow_timing && timings.GetTotalNs() > MsToNs(1000))) { - LOG(INFO) << Dumpable<base::TimingLogger>(timings); + LOG(INFO) << Dumpable<TimingLogger>(timings); } // Everything was successfully written, do an explicit exit here to avoid running Runtime |