commit 66f19258f9728d4ffe026074d8fd429d639802fa
author Mathieu Chartier <mathieuc@google.com> Tue Sep 18 08:57:04 2012 -0700
committer Mathieu Chartier <mathieuc@google.com> Fri Sep 21 17:32:56 2012 -0700
tree fd94009774c6cbbb1528ea096e606133bd35f104
parent a5e1e3d153990845d80cb8d013157210f11a473c

Change dex cache to be java object instead of array, add pointer to dex file in dex cache.

Generic clean up to facilitate having GDB macros for Pretty* helper functions.

Improved cleanliness of DexCache since having it as an object array was not the best solution.

Fixed a bug in InOrderWalk caused by ResolveType sometimes allocating classes.

Rename C++ Method to AbstractMethod and add two new classes Constructor, Method which both inherit from AbstractMethod.

Rename done to have the C++ code be closer to the java code.

Change-Id: I4995b4c5e47a3822192b08afa24a639d3b1f4da9

src/trace.h

diff --git a/src/trace.h b/src/trace.h
index 9c64347..43b0ff7 100644
--- a/src/trace.h
+++ b/src/trace.h
@@ -29,17 +29,17 @@
 
 namespace art {
 
-class Method;
+class AbstractMethod;
 class Thread;
 
 uint32_t TraceMethodUnwindFromCode(Thread* self);
 
 struct TraceStackFrame {
-  TraceStackFrame(Method* method, uintptr_t return_pc)
+  TraceStackFrame(AbstractMethod* method, uintptr_t return_pc)
       : method_(method), return_pc_(return_pc) {
   }
 
-  Method* method_;
+  AbstractMethod* method_;
   uintptr_t return_pc_;
 };
 
@@ -70,14 +70,14 @@
   bool UseWallClock();
   bool UseThreadCpuClock();
 
-  void LogMethodTraceEvent(Thread* self, const Method* method, TraceEvent event);
+  void LogMethodTraceEvent(Thread* self, const AbstractMethod* method, TraceEvent event);
 
-  void AddSavedCodeToMap(const Method* method, const void* code);
-  void RemoveSavedCodeFromMap(const Method* method);
-  const void* GetSavedCodeFromMap(const Method* method);
+  void AddSavedCodeToMap(const AbstractMethod* method, const void* code);
+  void RemoveSavedCodeFromMap(const AbstractMethod* method);
+  const void* GetSavedCodeFromMap(const AbstractMethod* method);
 
-  void SaveAndUpdateCode(Method* method);
-  void ResetSavedCode(Method* method);
+  void SaveAndUpdateCode(AbstractMethod* method);
+  void ResetSavedCode(AbstractMethod* method);
 
  private:
   explicit Trace(File* trace_file, int buffer_size, int flags);
@@ -97,10 +97,10 @@
   void DumpThreadList(std::ostream& os) LOCKS_EXCLUDED(Locks::thread_list_lock_);
 
   // Maps a method to its original code pointer.
-  SafeMap<const Method*, const void*> saved_code_map_;
+  SafeMap<const AbstractMethod*, const void*> saved_code_map_;
 
   // Set of methods visited by the profiler.
-  std::set<const Method*> visited_methods_;
+  std::set<const AbstractMethod*> visited_methods_;
 
   // Maps a thread to its clock base.
   SafeMap<Thread*, uint64_t> thread_clock_base_map_;