summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Neil Fuller <nfuller@google.com> 2016-08-17 13:19:28 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2016-08-17 13:19:28 +0000
commitd1272553516e6595dea310d07d7b974dcd0a421f (patch)
treea9314e5e1cd4481a02c220f218cb654a1be6b818
parent1d36e2c312216528ad721a70e8a29db321e4fdd6 (diff)
parentd833525cfe3ac2086e3156a8b3193c05974d6316 (diff)
Merge "Logging improvements for C++ / Java structure issues"
-rw-r--r--runtime/gc/collector/mark_sweep.cc4
-rw-r--r--runtime/mirror/class.cc2
2 files changed, 3 insertions, 3 deletions
diff --git a/runtime/gc/collector/mark_sweep.cc b/runtime/gc/collector/mark_sweep.cc
index e276137033..1d15ee7334 100644
--- a/runtime/gc/collector/mark_sweep.cc
+++ b/runtime/gc/collector/mark_sweep.cc
@@ -413,7 +413,7 @@ class MarkSweep::MarkObjectSlowPath {
if (UNLIKELY(obj == nullptr || !IsAligned<kPageSize>(obj) ||
(kIsDebugBuild && large_object_space != nullptr &&
!large_object_space->Contains(obj)))) {
- LOG(INTERNAL_FATAL) << "Tried to mark " << obj << " not contained by any spaces";
+ LOG(INTERNAL_FATAL) << "Tried to mark " << obj << " not contained by any spaces\n";
if (holder_ != nullptr) {
size_t holder_size = holder_->SizeOf();
ArtField* field = holder_->FindFieldByOffset(offset_);
@@ -442,7 +442,7 @@ class MarkSweep::MarkObjectSlowPath {
for (size_t i = 0; i < holder_size / sizeof(uint32_t); ++i) {
uint32_t* p = reinterpret_cast<uint32_t*>(holder_);
LOG(INTERNAL_FATAL) << &p[i] << ": " << "holder+" << (i * sizeof(uint32_t)) << " = "
- << std::hex << p[i];
+ << std::hex << p[i] << "\n";
}
}
PrintFileToLog("/proc/self/maps", LogSeverity::INTERNAL_FATAL);
diff --git a/runtime/mirror/class.cc b/runtime/mirror/class.cc
index f948be79c9..1cf9dd1612 100644
--- a/runtime/mirror/class.cc
+++ b/runtime/mirror/class.cc
@@ -136,7 +136,7 @@ void Class::SetDexCache(DexCache* new_dex_cache) {
void Class::SetClassSize(uint32_t new_class_size) {
if (kIsDebugBuild && new_class_size < GetClassSize()) {
DumpClass(LOG(INTERNAL_FATAL), kDumpClassFullDetail);
- LOG(INTERNAL_FATAL) << new_class_size << " vs " << GetClassSize();
+ LOG(INTERNAL_FATAL) << new_class_size << " vs " << GetClassSize() << "\n";
LOG(FATAL) << " class=" << PrettyTypeOf(this);
}
// Not called within a transaction.