Merge pull request #99 from Shopify/typed-data

Convert to TypedData API

Gemfile

@@ -3,6 +3,6 @@
 source "https://rubygems.org"
 gemspec
 
-gem "rubocop", "~> 1.22", require: false
-gem "rubocop-shopify", "~> 2.3.0", require: false
+gem "rubocop", require: false
+gem "rubocop-shopify", require: false
 gem "ruby_memcheck", "~> 0.3.0", require: false

dev.yml

@@ -5,7 +5,7 @@ env:
   ROTOSCOPE_COMPILE_ERROR: '1'
 
 up:
-  - ruby: 2.7.4
+  - ruby: 2.7.8
   - homebrew:
     - clang-format
   - bundler

ext/rotoscope/rotoscope.c

@@ -132,22 +132,38 @@ static void event_hook(VALUE tpval, void *data) {
   rb_funcall(config->trace_proc, id_call, 1, config->self);
 }
 
-static void rs_gc_mark(Rotoscope *config) {
+static void rs_gc_mark(void *data) {
+  Rotoscope *config = (Rotoscope *)data;
   rb_gc_mark(config->tracepoint);
   rb_gc_mark(config->trace_proc);
   rs_stack_mark(&config->stack);
 }
 
-void rs_dealloc(Rotoscope *config) {
+static void rs_dealloc(void *data) {
+  Rotoscope *config = (Rotoscope *)data;
   stop_tracing_on_cleanup(config);
   rs_stack_free(&config->stack);
   xfree(config);
 }
 
+static size_t rs_memsize(const void *data) {
+  return sizeof(Rotoscope);
+}
+
+static const rb_data_type_t rs_data_type = {
+    .wrap_struct_name = "Rotoscope",
+    .function = {
+        .dmark = rs_gc_mark,
+        .dfree = rs_dealloc,
+        .dsize = rs_memsize,
+    },
+    .flags = RUBY_TYPED_FREE_IMMEDIATELY
+};
+
 static VALUE rs_alloc(VALUE klass) {
   Rotoscope *config;
   VALUE self =
-      Data_Make_Struct(klass, Rotoscope, rs_gc_mark, rs_dealloc, config);
+      TypedData_Make_Struct(klass, Rotoscope, &rs_data_type, config);
   config->self = self;
   config->pid = getpid();
   config->tid = current_thread_id();
@@ -168,7 +184,7 @@ static VALUE rs_alloc(VALUE klass) {
 
 static Rotoscope *get_config(VALUE self) {
   Rotoscope *config;
-  Data_Get_Struct(self, Rotoscope, config);
+  TypedData_Get_Struct(self, Rotoscope, &rs_data_type, config);
   return config;
 }
 

lib/rotoscope/call_logger.rb

@@ -98,6 +98,7 @@ def closed?
 
     def state
       return :closed if io.closed?
+
       @rotoscope.tracing? ? :tracing : :open
     end
 
@@ -142,6 +143,7 @@ def prevent_flush_from_finalizer_in_fork(io)
       pid = Process.pid
       finalizer = lambda do |_|
         next if Process.pid == pid
+
         # close the file descriptor from another IO object so
         # buffered writes aren't flushed
         IO.for_fd(io.fileno).close

lib/rotoscope/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class Rotoscope
-  VERSION = "0.3.1.pre.1"
+  VERSION = "0.3.1.pre.2"
 end

test/monadify.rb

@@ -1,8 +1,10 @@
 # frozen_string_literal: true
 
 module Monadify
-  def self.extended(base)
-    base.define_singleton_method("contents=") { |val| val }
+  class << self
+    def extended(base)
+      base.define_singleton_method("contents=") { |val| val }
+    end
   end
 
   define_method("contents") do