commit bbe3a5efcdfb2fb15a4e5f724cc323ae0ada5111
author Mathieu Chartier <mathieuc@google.com> Tue Jun 13 16:36:17 2017 -0700
committer Mathieu Chartier <mathieuc@google.com> Thu Jun 15 11:45:06 2017 -0700
tree 65fd149e1159674681d866e47e485d85b8464334
parent d58932f98a673c9d687863a7efafb2da168063a2

Refactor some profiling info functions

Deleted profile_compilation_info-inl.h

Added a new helper class MethodHotness to reduce the number of
required getters for reading method hotness, startup, and post
startup booleans.

Test: test-art-host
Bug: 62040831

Change-Id: I799a38e2bea6177ba5816c54524f4ccacedba772

profman/profman.cc

diff --git a/profman/profman.cc b/profman/profman.cc
index adef0d0..b46378e 100644
--- a/profman/profman.cc
+++ b/profman/profman.cc
@@ -779,13 +779,15 @@
             if (it.GetMethodCodeItemOffset() != 0) {
               // Add all of the methods that have code to the profile.
               const uint32_t method_idx = it.GetMemberIndex();
-              methods.push_back(ProfileMethodInfo(dex_file, method_idx));
+              methods.push_back(ProfileMethodInfo(MethodReference(dex_file, method_idx)));
             }
             it.Next();
           }
         }
       }
-      profile->AddMethodsAndClasses(methods, resolved_class_set);
+      // TODO: Check return values?
+      profile->AddMethods(methods);
+      profile->AddClasses(resolved_class_set);
       return true;
     }
 
@@ -833,28 +835,23 @@
       }
       inline_caches.emplace_back(dex_pc, is_missing_types, classes);
     }
-    ProfileMethodInfo pmi(class_ref.dex_file, method_index, inline_caches);
+    MethodReference ref(class_ref.dex_file, method_index);
     if (is_hot) {
-      profile->AddMethod(pmi);
+      profile->AddMethod(ProfileMethodInfo(ref, inline_caches));
     }
+    uint32_t flags = 0;
+    using Hotness = ProfileCompilationInfo::MethodHotness;
     if (is_startup) {
-      if (!profile->AddSampledMethod(/*is_startup*/ true,
-                                     pmi.dex_file->GetLocation(),
-                                     pmi.dex_file->GetLocationChecksum(),
-                                     method_index,
-                                     pmi.dex_file->NumMethodIds())) {
-        return false;
-      }
-      DCHECK(profile->IsStartupOrHotMethod(MethodReference(pmi.dex_file, method_index)));
+      flags |= Hotness::kFlagStartup;
     }
     if (is_post_startup) {
-      if (!profile->AddSampledMethod(/*is_startup*/ false,
-                                     pmi.dex_file->GetLocation(),
-                                     pmi.dex_file->GetLocationChecksum(),
-                                     method_index,
-                                     pmi.dex_file->NumMethodIds())) {
+      flags |= Hotness::kFlagPostStartup;
+    }
+    if (flags != 0) {
+      if (!profile->AddMethodIndex(static_cast<Hotness::Flag>(flags), ref)) {
         return false;
       }
+      DCHECK(profile->GetMethodHotness(ref).HasAnyFlags());
     }
     return true;
   }