Track live instance and allocation counts for classes

runtime/vm/scavenger.cc

 // Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/scavenger.h"
 
 #include <algorithm>
 #include <map>
 #include <utility>
 
@@ skipping 167 matching lines @@
         for (DelaySet::iterator it = ret.first; it != ret.second; ++it) {
           // Remember the delayed WeakProperty. These objects have been
           // forwarded, but have not been scavenged because their key was not
           // known to be reachable. Now that the key object is known to be
           // reachable, we need to visit its key and value pointers.
           delayed_weak_stack_.Add(it->second);
         }
         delay_set_.erase(ret.first, ret.second);
       }
       intptr_t size = raw_obj->Size();
+      intptr_t cid = raw_obj->GetClassId();
+      ClassTable* class_table = isolate()->class_table();
       // Check whether object should be promoted.
       if (scavenger_->survivor_end_ <= raw_addr) {
         // Not a survivor of a previous scavenge. Just copy the object into the
         // to space.
         new_addr = scavenger_->TryAllocate(size);
+        class_table->UpdateLiveNew(cid, size);
       } else {
         // TODO(iposva): Experiment with less aggressive promotion. For example
         // a coin toss determines if an object is promoted or whether it should
         // survive in this generation.
         //
         // This object is a survivor of a previous scavenge. Attempt to promote
         // the object.
         new_addr = heap_->TryAllocate(size, Heap::kOld, growth_policy_);
         if (new_addr != 0) {
           // If promotion succeeded then we need to remember it so that it can
           // be traversed later.
           scavenger_->PushToPromotedStack(new_addr);
           bytes_promoted_ += size;
+          class_table->UpdateAllocatedOld(cid, size);
         } else if (!scavenger_->had_promotion_failure_) {
           // Signal a promotion failure and set the growth policy for
           // this, and all subsequent promotion allocations, to force
           // growth.
           scavenger_->had_promotion_failure_ = true;
           growth_policy_ = PageSpace::kForceGrowth;
           new_addr = heap_->TryAllocate(size, Heap::kOld, growth_policy_);
           if (new_addr != 0) {
             scavenger_->PushToPromotedStack(new_addr);
             bytes_promoted_ += size;
+            class_table->UpdateAllocatedOld(cid, size);
           } else {
             // Promotion did not succeed. Copy into the to space
             // instead.
             new_addr = scavenger_->TryAllocate(size);
+            class_table->UpdateLiveNew(cid, size);
           }
         } else {
           ASSERT(growth_policy_ == PageSpace::kForceGrowth);
           // Promotion did not succeed. Copy into the to space instead.
           new_addr = scavenger_->TryAllocate(size);
+          class_table->UpdateLiveNew(cid, size);
         }
       }
       // During a scavenge we always succeed to at least copy all of the
       // current objects to the to space.
       ASSERT(new_addr != 0);
       // Copy the object to the new location.
       memmove(reinterpret_cast<void*>(new_addr),
               reinterpret_cast<void*>(raw_addr),
               size);
       // Remember forwarding address.
@@ skipping 69 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(VerifyStoreBufferPointerVisitor);
 };
 
 
 Scavenger::Scavenger(Heap* heap,
                      intptr_t max_capacity_in_words,
                      uword object_alignment)
     : heap_(heap),
       object_alignment_(object_alignment),
-      scavenging_(false) {
+      scavenging_(false),
+      gc_time_micros_(0),
+      collections_(0) {
   // Verify assumptions about the first word in objects which the scavenger is
   // going to use for forwarding pointers.
   ASSERT(Object::tags_offset() == 0);
 
   // Allocate the virtual memory for this scavenge heap.
   space_ = VirtualMemory::Reserve(max_capacity_in_words << kWordSizeLog2);
   if (space_ == NULL) {
     FATAL("Out of memory.\n");
   }
 
@@ skipping 376 matching lines @@
   scavenging_ = false;
 }
 
 
 void Scavenger::WriteProtect(bool read_only) {
   space_->Protect(
       read_only ? VirtualMemory::kReadOnly : VirtualMemory::kReadWrite);
 }
 
 
+void Scavenger::PrintToJSONObject(JSONObject* object) {
+  JSONObject space(object, "new");
+  space.AddProperty("type", "@Scavenger");
+  space.AddProperty("id", "heaps/new");
+  space.AddProperty("name", "Scavenger");
+  space.AddProperty("user_name", "new");
+  space.AddProperty("collections", collections());
+  space.AddProperty("used", UsedInWords() * kWordSize);
+  space.AddProperty("capacity", CapacityInWords() * kWordSize);
+  space.AddProperty("time", RoundMicrosecondsToSeconds(gc_time_micros()));
+}
+
+
 }  // namespace dart