Merge bleeding_edge revisions 2971, 2972 (heap profiler updates) to trunk....

src/heap-profiler.h

 // Copyright 2009 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 35 matching lines @@
 };
 
 
 // JSObjectsCluster describes a group of JS objects that are
 // considered equivalent in terms of a particular profile.
 class JSObjectsCluster BASE_EMBEDDED {
  public:
   // These special cases are used in retainer profile.
   enum SpecialCase {
     ROOTS = 1,
-    GLOBAL_PROPERTY = 2
+    GLOBAL_PROPERTY = 2,
+    SELF = 3  // This case is used in ClustersCoarser only.
   };
 
   JSObjectsCluster() : constructor_(NULL), instance_(NULL) {}
   explicit JSObjectsCluster(String* constructor)
       : constructor_(constructor), instance_(NULL) {}
   explicit JSObjectsCluster(SpecialCase special)
       : constructor_(FromSpecialCase(special)), instance_(NULL) {}
   JSObjectsCluster(String* constructor, Object* instance)
       : constructor_(constructor), instance_(instance) {}
 
   static int CompareConstructors(const JSObjectsCluster& a,
                                  const JSObjectsCluster& b) {
     // Strings are unique, so it is sufficient to compare their pointers.
     return a.constructor_ == b.constructor_ ? 0
         : (a.constructor_ < b.constructor_ ? -1 : 1);
   }
   static int Compare(const JSObjectsCluster& a, const JSObjectsCluster& b) {
     // Strings are unique, so it is sufficient to compare their pointers.
     const int cons_cmp = CompareConstructors(a, b);
     return cons_cmp == 0 ?
         (a.instance_ == b.instance_ ? 0 : (a.instance_ < b.instance_ ? -1 : 1))
         : cons_cmp;
   }
+  static int Compare(const JSObjectsCluster* a, const JSObjectsCluster* b) {
+    return Compare(*a, *b);
+  }
 
   bool is_null() const { return constructor_ == NULL; }
   bool can_be_coarsed() const { return instance_ != NULL; }
   String* constructor() const { return constructor_; }
 
   void Print(StringStream* accumulator) const;
   // Allows null clusters to be printed.
   void DebugPrint(StringStream* accumulator) const;
 
  private:
   static String* FromSpecialCase(SpecialCase special) {
     // We use symbols that are illegal JS identifiers to identify special cases.
     // Their actual value is irrelevant for us.
     switch (special) {
       case ROOTS: return Heap::result_symbol();
       case GLOBAL_PROPERTY: return Heap::code_symbol();
+      case SELF: return Heap::catch_var_symbol();
       default:
         UNREACHABLE();
         return NULL;
     }
   }
 
   String* constructor_;
   Object* instance_;
 };
 
@@ skipping 70 matching lines @@
             const NumberAndSizeInfo& number_and_size);
 
  private:
   // Stores a list of back references for a cluster.
   struct ClusterBackRefs {
     explicit ClusterBackRefs(const JSObjectsCluster& cluster_);
     ClusterBackRefs(const ClusterBackRefs& src);
     ClusterBackRefs& operator=(const ClusterBackRefs& src);
 
     static int Compare(const ClusterBackRefs& a, const ClusterBackRefs& b);
+    void SortRefs() { refs.Sort(JSObjectsCluster::Compare); }
+    static void SortRefsIterator(ClusterBackRefs* ref) { ref->SortRefs(); }
 
     JSObjectsCluster cluster;
     ZoneList<JSObjectsCluster> refs;
   };
   typedef ZoneList<ClusterBackRefs> SimilarityList;
 
   // A tree for storing a list of equivalents for a cluster.
   struct ClusterEqualityConfig {
     typedef JSObjectsCluster Key;
     typedef JSObjectsCluster Value;
@@ skipping 16 matching lines @@
   static const int kInitialSimilarityListCapacity = 2000;
   // Number of passes for finding equivalents. Limits the length of paths
   // that can be considered equivalent.
   static const int kMaxPassesCount = 10;
 
   ZoneScope zscope_;
   SimilarityList sim_list_;
   EqualityTree eq_tree_;
   ClusterBackRefs* current_pair_;
   JSObjectsRetainerTree* current_set_;
+  const JSObjectsCluster* self_;
 };
 
 
 // RetainerHeapProfile is responsible for gathering and logging
 // "retainer profile" of JS objects allocated on heap.
 // It is run during garbage collection cycle, thus it doesn't need
 // to use handles.
 class RetainerHeapProfile BASE_EMBEDDED {
  public:
   class Printer {
    public:
     virtual ~Printer() {}
     virtual void PrintRetainers(const JSObjectsCluster& cluster,
                                 const StringStream& retainers) = 0;
   };
 
   RetainerHeapProfile();
   void CollectStats(HeapObject* obj);
   void PrintStats();
   void DebugPrintStats(Printer* printer);
   void StoreReference(const JSObjectsCluster& cluster, HeapObject* ref);
 
  private:
-  // Limit on the number of retainers to be printed per cluster.
-  static const int kMaxRetainersToPrint = 50;
   ZoneScope zscope_;
   JSObjectsRetainerTree retainers_tree_;
   ClustersCoarser coarser_;
-  // TODO(mnaganov): Use some helper class to hold these state variables.
-  JSObjectsClusterTree* coarse_cluster_tree_;
-  Printer* current_printer_;
-  StringStream* current_stream_;
- public:
-  // Used by JSObjectsRetainerTree::ForEach.
-  void Call(const JSObjectsCluster& cluster, JSObjectsClusterTree* tree);
-  void Call(const JSObjectsCluster& cluster,
-            const NumberAndSizeInfo& number_and_size);
 };
 
 
 #endif  // ENABLE_LOGGING_AND_PROFILING
 
 } }  // namespace v8::internal
 
 #endif  // V8_HEAP_PROFILER_H_