Added CallSite#reset.

This will enable resetting all the CallSites in a process to a known state to be able to eg using CallSite data for computing code coverage.
rubinius · Apr 27, 2016 · 12f88d4 · 12f88d4
1 parent 20938ee
commit 12f88d4
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/core/call_site.rb b/core/call_site.rb
@@ -28,6 +28,11 @@ def misses
       raise PrimitiveFailure, "CallSite#misses primitive failed"
     end
 
+    def reset
+      Rubinius.primitive :call_site_reset
+      raise PrimitiveFailure, "CallSite#reset primitive failed"
+    end
+
     def inspect
       "#<#{self.class.name}:0x#{self.object_id.to_s(16)} name=#{@name} ip=#{ip} depth=#{depth} invokes=#{invokes} hits=#{hits} misses=#{misses}>"
     end

diff --git a/machine/builtin/call_site.hpp b/machine/builtin/call_site.hpp
@@ -358,9 +358,9 @@ namespace rubinius {
         if(atomic::compare_and_swap(reinterpret_cast<void**>(updated_caches),
             previous_caches, inline_caches))
         {
-          if(previous_caches) delete[] previous_caches;
+          if(previous_caches) delete previous_caches;
         } else {
-          delete[] inline_caches;
+          delete inline_caches;
         }
 
         return;
@@ -397,7 +397,7 @@ namespace rubinius {
             execute(CallSite::dispatch);
             cache_miss(CallSite::dispatch);
 
-            delete[] caches();
+            delete caches();
             caches(NULL);
 
             atomic::memory_barrier();
@@ -506,6 +506,18 @@ namespace rubinius {
       return Integer::from(state, misses());
     }
 
+    // Rubinius.primitive :call_site_reset
+    CallSite* reset(STATE) {
+      if(caches()) delete caches();
+
+      invokes(0);
+      execute(default_execute);
+      cache_miss(default_execute);
+      caches(NULL);
+
+      return this;
+    }
+
     class Info : public TypeInfo {
     public:
       Info(object_type type)