diff options
| author | 2014-08-12 10:13:48 -0700 | |
|---|---|---|
| committer | 2014-08-12 10:32:06 -0700 | |
| commit | c30a7257f1d0cc79931f38e8cbbb45aab8682acb (patch) | |
| tree | a531faa3879ad7c9bee409cf9b00662d33c51368 | |
| parent | 66386248003a46ecbe4fac99aec902cfd0942847 (diff) | |
Prevent merge conflicts.
Change-Id: I61af7f3c9be47d4776371dfe2b97850ea3f3101f
| -rw-r--r-- | runtime/gc/heap.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/runtime/gc/heap.cc b/runtime/gc/heap.cc index 1ea514b3b2..cfaa1706fa 100644 --- a/runtime/gc/heap.cc +++ b/runtime/gc/heap.cc @@ -788,14 +788,14 @@ void Heap::DumpGcPerformanceInfo(std::ostream& os) { << (GetObjectsFreedEver() / total_seconds) << " objects/s\n"; } uint64_t total_objects_allocated = GetObjectsAllocatedEver(); - os << "Total number of allocations: " << total_objects_allocated << "\n"; + os << "Total number of allocations " << total_objects_allocated << "\n"; uint64_t total_bytes_allocated = GetBytesAllocatedEver(); os << "Total bytes allocated " << PrettySize(total_bytes_allocated) << "\n"; - os << "Free memory" << PrettySize(GetFreeMemoryUntilGC()) << "\n"; + os << "Free memory " << PrettySize(GetFreeMemory()) << "\n"; os << "Free memory until GC " << PrettySize(GetFreeMemoryUntilGC()) << "\n"; os << "Free memory until OOME " << PrettySize(GetFreeMemoryUntilOOME()) << "\n"; - os << "Total memory" << PrettySize(GetTotalMemory()) << "\n"; - os << "Max memory" << PrettySize(GetMaxMemory()) << "\n"; + os << "Total memory " << PrettySize(GetTotalMemory()) << "\n"; + os << "Max memory " << PrettySize(GetMaxMemory()) << "\n"; if (kMeasureAllocationTime) { os << "Total time spent allocating: " << PrettyDuration(allocation_time) << "\n"; os << "Mean allocation time: " << PrettyDuration(allocation_time / total_objects_allocated) |