dartsclone 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f885b4746eda49bbcdf7dd447acf1f5249f41fd3f259b9b5a0c4aefdb166a53
-  data.tar.gz: 1526d141d3e0671be8b7bf80ea192477a6f2795fbfc627050a1a7edb9e37f7f7
+  metadata.gz: 97644d2ac4c4641a5ece8c2a6f75286843955f3a6c8c777c54984a33d7f40ffa
+  data.tar.gz: 11d1bc54058b6e13a13ed115df887cdfc80488466815d873bc7219739ba40f92
 SHA512:
-  metadata.gz: a3edde3163b959f31f61bed40d031bbeb6f86ca4774d9b110af4dd3d5e787210cef5fab01d87ba342def771ee52d28c133c643bd7179df8c42c6e2cc8e53c731
-  data.tar.gz: e292bcd0444398425b931a6bf92217b06cf1f45eedc85af841aeb82cbbcb4bd1caaab5f57f43e54aa8e59a5e8b833570c269d699c71a2bd0d7f4e15482197a62
+  metadata.gz: '0309acb6f96c43590c39cd1c2e11a47fe7ca35dbb8f9e8dbf71b5a5465607d561624837ea901ac60964c85453c50c8b6333c7a62cd477f48644056eabab60783'
+  data.tar.gz: cd63a1951b7f7bdd376ade80a3f978c45fc4c82e41c3418c3310182da5035b735c67189c932bdf6e1557d657d1415d3ee7df0dff39ab57e744d0d7d20c3d114a

data/.github/workflows/build.yml

@@ -1,6 +1,6 @@
 name: build
 
-on: [push]
+on: [push, pull_request]
 
 jobs:
   build:

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.2.2
+- Refactor native extension codes considering garbage collection.
+
 ## 0.2.1
 - Replace Data_ functions to TypedData_ functions.
 - Fix some config files.

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2020 Atsushi Tatsuma
+Copyright (c) 2020-2021 Atsushi Tatsuma
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

data/ext/dartsclone/dartscloneext.hpp

@@ -1,6 +1,8 @@
 #ifndef DARTSCLONEEXT_HPP
 #define DARTSCLONEEXT_HPP 1
 
+#include <cstring>
+
 #include <ruby.h>
 #include <darts.h>
 
@@ -68,22 +70,26 @@ class RbDoubleArray
       const int n_keys = RARRAY_LEN(_keys);
       char** keys = (char**)ruby_xmalloc(n_keys * sizeof(char*));
       int* values = _values == Qundef ? NULL : (int*)ruby_xmalloc(n_keys * sizeof(int));
+      VALUE key_str;
       for (int i = 0; i < n_keys; i++) {
-        VALUE key_str = rb_ary_entry(_keys, i);
-        keys[i] = StringValueCStr(key_str);
+        key_str = rb_ary_entry(_keys, i);
+        keys[i] = strcpy((char*)ruby_xmalloc((RSTRING_LEN(key_str) + 1) * sizeof(char)), StringValueCStr(key_str));
         if (_values != Qundef) values[i] = NUM2INT(rb_ary_entry(_values, i));
       }
 
       try {
         get_double_array(self)->build(n_keys, keys, NULL, values);
       } catch (Darts::Details::Exception e) {
+        for (int i = 0; i < n_keys; i++) ruby_xfree(keys[i]);
         ruby_xfree(keys);
         if (_values != Qundef) ruby_xfree(values);
         rb_raise(rb_eRuntimeError, "%s", e.what());
         return Qfalse;
       }
+      for (int i = 0; i < n_keys; i++) ruby_xfree(keys[i]);
       ruby_xfree(keys);
       if (_values != Qundef) ruby_xfree(values);
+      RB_GC_GUARD(key_str);
       return Qtrue;
     }
 
@@ -97,13 +103,16 @@ class RbDoubleArray
       rb_get_kwargs(kwargs, kwtable, 0, 3, kwvalues);
 
       const char* filename = StringValueCStr(_filename);
-      const char* mode = kwvalues[0] == Qundef ? "rb" : StringValueCStr(kwvalues[0]);
+      VALUE _mode = kwvalues[0];
+      const char* mode = kwvalues[0] == Qundef ? "rb" : StringValueCStr(_mode);
       const size_t offset = kwvalues[1] == Qundef ? 0 : NUM2SIZET(kwvalues[1]);
       const size_t size = kwvalues[2] == Qundef ? 0 : NUM2SIZET(kwvalues[2]);
 
       if (get_double_array(self)->open(filename, mode, offset, size) != 0) {
         return Qfalse;
       }
+      RB_GC_GUARD(_filename);
+      RB_GC_GUARD(_mode);
       return Qtrue;
     };
 
@@ -117,12 +126,15 @@ class RbDoubleArray
       rb_get_kwargs(kwargs, kwtable, 0, 2, kwvalues);
 
       const char* filename = StringValueCStr(_filename);
-      const char* mode = kwvalues[0] == Qundef ? "wb" : StringValueCStr(kwvalues[0]);
+      VALUE _mode = kwvalues[0];
+      const char* mode = kwvalues[0] == Qundef ? "wb" : StringValueCStr(_mode);
       const size_t offset = kwvalues[1] == Qundef ? 0 : NUM2SIZET(kwvalues[1]);
 
       if (get_double_array(self)->save(filename, mode, offset) != 0) {
         return Qfalse;
       }
+      RB_GC_GUARD(_filename);
+      RB_GC_GUARD(_mode);
       return Qtrue;
     };
 
@@ -137,6 +149,7 @@ class RbDoubleArray
       const size_t total_sz = sz / get_double_array(self)->unit_size();
       char* arr = StringValuePtr(bytes);
       get_double_array(self)->set_array(arr, total_sz);
+      RB_GC_GUARD(bytes);
       return Qnil;
     };
 
@@ -160,6 +173,7 @@ class RbDoubleArray
 
       Darts::DoubleArray::value_type value;
       get_double_array(self)->exactMatchSearch(key, value, length, node_pos);
+      RB_GC_GUARD(_key);
       return INT2NUM(value);
     };
 
@@ -200,6 +214,7 @@ class RbDoubleArray
         rb_ary_push(ret, values);
       }
       ruby_xfree(results);
+      RB_GC_GUARD(_key);
       return ret;
     };
 

data/lib/dartsclone/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module DartsClone
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
   DARTS_CLONE_VERSION = '0.32'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dartsclone
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - yoshoku
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-29 00:00:00.000000000 Z
+date: 2021-01-17 00:00:00.000000000 Z
 dependencies: []
 description: Darts-clone.rb is a Ruby binding for the Darts-clone.
 email: