commit 1aad2846e1fb19cfa3736fc940b629464b93fb03
author Hans Boehm <hboehm@google.com> Mon Aug 16 16:53:17 2021 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Aug 19 03:21:37 2021 +0000
tree ec5e36b55cbabcab999ea11dc679ae4aa9c7f122
parent fe3c74bd60110e57eb156c3199a33b30f2169506

Revert "Make ClassLinker::DumpForSigQuit exclude gc"

This reverts commit 825e82972fe46fdb0419c42bd7df102df1989ff9.

Reason for revert: Not clear it fixed anything. See b/195261575 .

Bug: 195261575
Test: TreeHugger
Change-Id: I6fd0d10b5134037d2df399abbbaa3302454f0e4f
Merged-In: I6fd0d10b5134037d2df399abbbaa3302454f0e4f
(cherry picked from commit fb3ad7201bf2d9154862e347e960df376ac04c3c)
(cherry picked from commit 883e103f04064957a5e8880890577fe556e38db9)

runtime/class_linker.cc

diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc
index b9751ab..8b9e42a 100644
--- a/runtime/class_linker.cc
+++ b/runtime/class_linker.cc
@@ -9814,22 +9814,16 @@
 }
 
 void ClassLinker::DumpForSigQuit(std::ostream& os) {
-  // Avoid a deadlock between a garbage collecting thread running a checkpoint,
-  // a thread holding the dex or classlinker lock and blocking on a condition variable for
-  // weak references access, and a thread blocking on the dex or classlinker lock and thus
-  // unable to run the checkpoint.
-  Thread* self = Thread::Current();
-  ScopedObjectAccess soa(self);
-  gc::ScopedGCCriticalSection gcs(self, gc::kGcCauseClassLinker, gc::kCollectorTypeClassLinker);
-  ReaderMutexLock mu(self, *Locks::classlinker_classes_lock_);
+  ScopedObjectAccess soa(Thread::Current());
+  ReaderMutexLock mu(soa.Self(), *Locks::classlinker_classes_lock_);
   os << "Zygote loaded classes=" << NumZygoteClasses() << " post zygote classes="
      << NumNonZygoteClasses() << "\n";
-  ReaderMutexLock mu2(self, *Locks::dex_lock_);
+  ReaderMutexLock mu2(soa.Self(), *Locks::dex_lock_);
   os << "Dumping registered class loaders\n";
   size_t class_loader_index = 0;
   for (const ClassLoaderData& class_loader : class_loaders_) {
     ObjPtr<mirror::ClassLoader> loader =
-        ObjPtr<mirror::ClassLoader>::DownCast(self->DecodeJObject(class_loader.weak_root));
+        ObjPtr<mirror::ClassLoader>::DownCast(soa.Self()->DecodeJObject(class_loader.weak_root));
     if (loader != nullptr) {
       os << "#" << class_loader_index++ << " " << loader->GetClass()->PrettyDescriptor() << ": [";
       bool saw_one_dex_file = false;
@@ -9848,7 +9842,7 @@
         size_t parent_index = 0;
         for (const ClassLoaderData& class_loader2 : class_loaders_) {
           ObjPtr<mirror::ClassLoader> loader2 = ObjPtr<mirror::ClassLoader>::DownCast(
-              self->DecodeJObject(class_loader2.weak_root));
+              soa.Self()->DecodeJObject(class_loader2.weak_root));
           if (loader2 == loader->GetParent()) {
             os << ", parent #" << parent_index;
             found_parent = true;