summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--runtime/gc/heap.cc9
-rw-r--r--runtime/oat_file_manager.cc3
2 files changed, 11 insertions, 1 deletions
diff --git a/runtime/gc/heap.cc b/runtime/gc/heap.cc
index 776695dba9..f27bddb361 100644
--- a/runtime/gc/heap.cc
+++ b/runtime/gc/heap.cc
@@ -3630,6 +3630,15 @@ collector::GcType Heap::WaitForGcToCompleteLocked(GcCause cause, Thread* self) {
void Heap::DumpForSigQuit(std::ostream& os) {
os << "Heap: " << GetPercentFree() << "% free, " << PrettySize(GetBytesAllocated()) << "/"
<< PrettySize(GetTotalMemory()) << "; " << GetObjectsAllocated() << " objects\n";
+ {
+ os << "Image spaces:\n";
+ ScopedObjectAccess soa(Thread::Current());
+ for (const auto& space : continuous_spaces_) {
+ if (space->IsImageSpace()) {
+ os << space->GetName() << "\n";
+ }
+ }
+ }
DumpGcPerformanceInfo(os);
}
diff --git a/runtime/oat_file_manager.cc b/runtime/oat_file_manager.cc
index 32de17486e..25ebaff7d5 100644
--- a/runtime/oat_file_manager.cc
+++ b/runtime/oat_file_manager.cc
@@ -278,7 +278,8 @@ std::vector<std::unique_ptr<const DexFile>> OatFileManager::OpenDexFilesFromOat(
image_space = gc::space::ImageSpace::CreateFromAppImage(
art_file.c_str(), oat_file.get(), &error_msg);
if (image_space == nullptr) {
- VLOG(image) << "Could not load runtime generated app image: " << error_msg;
+ (OS::FileExists(art_file.c_str()) ? LOG_STREAM(INFO) : VLOG_STREAM(image))
+ << "Could not load runtime generated app image: " << error_msg;
}
}
}