pycall 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79fa29a4fd735c0741f03e74aadce297273cd2d64c0813b9ee2e20ad5fa321b9
-  data.tar.gz: 108942ac4b4d45324644fe90af4e56e239f7ce3b2f27fa0d98d5defa439da8db
+  metadata.gz: b016b6c9b12867d113713238ecc171cc4fde8965197c79c59abf66d8bb3b252e
+  data.tar.gz: abb36597376d37744972f7bb537ab61032387c73947d7846b9947bb622bf04ac
 SHA512:
-  metadata.gz: eb899c3e9c353622945df3b816df4588cd3b4606f723c53973a2f8d77d8eb9edf94b7dbcf15ff4d33f65430fd6d38a8bc2ccc2fda2a1f8f274dc769b0280e42a
-  data.tar.gz: ff84eb82b4e10d1a2f699abd32cfcdcc6159cba6b83f2258bc4100c7229bb49ca1c7593b5a6629ef2081007728bc3be5e266b65c2967c49c043fb3dfe0bf3835
+  metadata.gz: 18bc020ef0c1f1d82e3796ae023170ee287bbf966c3efd12dd48f730eec585b7b70e00352d316e8e524e608c70bff0348937c1afc434ba7d6ae634223f0e1fa6
+  data.tar.gz: 9ea69bb090386a7a280be6a7c779b406f49a3de2da5b406c64529be6a462535cbe9eefaad404e3dd1dab6bc98a5840e2825708f8d1602e1404ab4dbd83ce43b2

data/CHANGES.md

@@ -1,5 +1,10 @@
 # The change history of PyCall
 
+## 1.4.1
+
+* Fix SEGV occurred on Windows
+* Add PyCall.iterable
+
 ## 1.4.0
 
 * Explicitly states that Windows is not supported yet in README

data/ext/pycall/gc.c

@@ -1,5 +1,74 @@
 #include "pycall_internal.h"
 
+struct gcguard {
+  st_table *guarded_objects;
+};
+
+static int
+gcguard_mark_i(st_data_t key, st_data_t val, st_data_t arg)
+{
+  VALUE obj = (VALUE)val;
+  rb_gc_mark(obj);
+  return ST_CONTINUE;
+}
+
+static void
+gcguard_mark(void* ptr)
+{
+  struct gcguard *gg = (struct gcguard *)ptr;
+  st_foreach(gg->guarded_objects, gcguard_mark_i, 0);
+}
+
+static void
+gcguard_free(void* ptr)
+{
+  struct gcguard *gg = (struct gcguard *)ptr;
+  st_free_table(gg->guarded_objects);
+}
+
+static size_t
+gcguard_memsize(const void* ptr)
+{
+  const struct gcguard *gg = (const struct gcguard *)ptr;
+  return st_memsize(gg->guarded_objects);
+}
+
+static rb_data_type_t gcguard_data_type = {
+  "PyCall::gcguard",
+  {
+    gcguard_mark,
+    gcguard_free,
+    gcguard_memsize,
+  },
+#ifdef RUBY_TYPED_FREE_IMMEDIATELY
+  0, 0, RUBY_TYPED_FREE_IMMEDIATELY
+#endif
+};
+
+static void
+gcguard_aset(VALUE gcguard, PyObject *pyptr, VALUE rbobj)
+{
+  struct gcguard *gg;
+  TypedData_Get_Struct(gcguard, struct gcguard, &gcguard_data_type, gg);
+
+  st_insert(gg->guarded_objects, (st_data_t)pyptr, (st_data_t)rbobj);
+}
+
+static void
+gcguard_delete(VALUE gcguard, PyObject *pyptr)
+{
+  if (rb_typeddata_is_kind_of(gcguard, &gcguard_data_type)) {
+    /* This check is necessary to avoid error on the process finalization phase */
+    struct gcguard *gg;
+    st_data_t key, val;
+
+    TypedData_Get_Struct(gcguard, struct gcguard, &gcguard_data_type, gg);
+
+    key = (st_data_t)pyptr;
+    st_delete(gg->guarded_objects, &key, &val);
+  }
+}
+
 static ID id_gcguard_table;
 static PyObject *weakref_callback_pyobj;
 static PyObject *gcguard_weakref_destroyed(PyObject *self, PyObject *weakref);
@@ -21,15 +90,15 @@ gcguard_weakref_destroyed(PyObject *self, PyObject *weakref)
 void
 pycall_gcguard_aset(PyObject *pyobj, VALUE rbobj)
 {
-  VALUE table = rb_ivar_get(mPyCall, id_gcguard_table);
-  rb_hash_aset(table, PTR2NUM(pyobj), rbobj);
+  VALUE gcguard = rb_ivar_get(mPyCall, id_gcguard_table);
+  gcguard_aset(gcguard, pyobj, rbobj);
 }
 
 void
 pycall_gcguard_delete(PyObject *pyobj)
 {
-  VALUE table = rb_ivar_get(mPyCall, id_gcguard_table);
-  rb_hash_delete(table, PTR2NUM(pyobj));
+  VALUE gcguard = rb_ivar_get(mPyCall, id_gcguard_table);
+  gcguard_delete(gcguard, pyobj);
 }
 
 void
@@ -64,11 +133,21 @@ pycall_gcguard_register(PyObject *pyobj, VALUE obj)
   pycall_gcguard_aset(wref, obj);
 }
 
+static VALUE
+gcguard_new(void)
+{
+  struct gcguard *gg;
+  VALUE obj = TypedData_Make_Struct(0, struct gcguard, &gcguard_data_type, gg);
+  gg->guarded_objects = st_init_numtable();
+
+  return obj;
+}
+
 void
 pycall_init_gcguard(void)
 {
   id_gcguard_table = rb_intern("gcguard_table");
-  rb_ivar_set(mPyCall, id_gcguard_table, rb_hash_new());
+  rb_ivar_set(mPyCall, id_gcguard_table, gcguard_new());
 
   weakref_callback_pyobj = Py_API(PyCFunction_NewEx)(&gcguard_weakref_callback_def, NULL, NULL);
 }

data/lib/pycall.rb

@@ -5,6 +5,7 @@ module PyCall
   require 'pycall/pyobject_wrapper'
   require 'pycall/pytypeobject_wrapper'
   require 'pycall/pymodule_wrapper'
+  require 'pycall/iterable_wrapper'
   require 'pycall/init'
 
   module_function
@@ -73,6 +74,10 @@ module PyCall
     LibPython::Helpers.import_module(name)
   end
 
+  def iterable(obj)
+    IterableWrapper.new(obj)
+  end
+
   def len(obj)
     case obj
     when PyObjectWrapper

data/lib/pycall/iterable_wrapper.rb

@@ -0,0 +1,32 @@
+module PyCall
+  class IterableWrapper
+    include Enumerable
+
+    def initialize(obj)
+      @obj = check_iterable(obj)
+    end
+
+    private def check_iterable(obj)
+      unless PyCall.hasattr?(obj, :__iter__)
+        raise ArgumentError, "%p object is not iterable" % obj
+      end
+      obj
+    end
+
+    def each
+      return enum_for(__method__) unless block_given?
+      iter = @obj.__iter__()
+      while true
+        begin
+          yield iter.__next__()
+        rescue PyCall::PyError => err
+          if err.type == PyCall.builtins.StopIteration
+            break
+          else
+            raise err
+          end
+        end
+      end
+    end
+  end
+end

data/lib/pycall/version.rb

@@ -1,5 +1,5 @@
 module PyCall
-  VERSION = "1.4.0"
+  VERSION = "1.4.1"
 
   module Version
     numbers, TAG = VERSION.split("-")

data/lib/pycall/wrapper_object_cache.rb

@@ -6,7 +6,12 @@ module PyCall
     rescue
       WMAP_SUPPORT_INT_KEY = false
     else
-      WMAP_SUPPORT_INT_KEY = true
+      case RUBY_PLATFORM
+      when /cygwin/, /mingw/, /mswin/
+        WMAP_SUPPORT_INT_KEY = false
+      else
+        WMAP_SUPPORT_INT_KEY = true
+      end
     end
 
     if WMAP_SUPPORT_INT_KEY

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pycall
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Kenta Murata
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-05-28 00:00:00.000000000 Z
+date: 2021-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -196,6 +196,7 @@ files:
 - lib/pycall/import.rb
 - lib/pycall/init.rb
 - lib/pycall/iruby_helper.rb
+- lib/pycall/iterable_wrapper.rb
 - lib/pycall/libpython.rb
 - lib/pycall/libpython/finder.rb
 - lib/pycall/libpython/pyobject_struct.rb
@@ -235,7 +236,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.21
 signing_key: 
 specification_version: 4
 summary: pycall