summaryrefslogtreecommitdiffstats
path: root/runtime/gc/collector/garbage_collector.h
diff options
context:
space:
mode:
authorIan Rogers <irogers@google.com>2013-11-14 00:17:20 -0800
committerIan Rogers <irogers@google.com>2013-11-14 14:59:57 -0800
commit5fe9af720048673e62ee29597a30bb9e54c903c5 (patch)
tree733dca70511f4798a3082b084a9a3d6da9f5914a /runtime/gc/collector/garbage_collector.h
parentdfe78a6e6b526d482298100a1f6392a8c7105522 (diff)
downloadart-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 'runtime/gc/collector/garbage_collector.h')
-rw-r--r--runtime/gc/collector/garbage_collector.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/gc/collector/garbage_collector.h b/runtime/gc/collector/garbage_collector.h
index 6111c2f..a80f593 100644
--- a/runtime/gc/collector/garbage_collector.h
+++ b/runtime/gc/collector/garbage_collector.h
@@ -64,7 +64,7 @@ class GarbageCollector {
void RegisterPause(uint64_t nano_length);
- base::TimingLogger& GetTimings() {
+ TimingLogger& GetTimings() {
return timings_;
}
@@ -131,7 +131,7 @@ class GarbageCollector {
const bool verbose_;
uint64_t duration_ns_;
- base::TimingLogger timings_;
+ TimingLogger timings_;
// Cumulative statistics.
uint64_t total_time_ns_;