pycall 1.0.3 → 1.1.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 254de6af22a7da5928ad1f5233727a7ac378c84c
-  data.tar.gz: fc897d3873076f610b527fb23841c4044793e317
+SHA256:
+  metadata.gz: 78588bb0a23c7fa9b5c522113598027e8c98aea9fb9b72e96b64a1db4e9cff41
+  data.tar.gz: '08d504ae9fdaa7ea8f532ca10848df3119264d956b259b40b3dfb356f5ea5834'
 SHA512:
-  metadata.gz: 32b60a4408b80fd5df671b8c1c9177d5973ff9fff11603ea0f4dd9407dbb27e39532f7d269cd7d5805e0e275ab2e5e9e956a247100160ecc091028b9757828df
-  data.tar.gz: 79d9c857888a3577f76428247bc73e999df73cbbac3269d39c86765d2b6656f32ca916caf54fe955921842a9119141e60b53d1a16973de63cf1a154b08715f27
+  metadata.gz: d3d9c586c37ec66a8a6a7bd1093b5fd0848aad2602ab6784fe73a50c08a05402289601d1e87d7bfe13f51b54f2f8002790e7c95ac4899de339ad8af7dedccae3
+  data.tar.gz: b3c3d61680274ff6e612dabd28818522637f479225f43a9a8025d2a036127b3fddc62d2342456673cf96cdc280ce8e388fa503e904b5d5860b44c0b0fa8c3a29

data/.travis.yml

@@ -7,9 +7,10 @@ sudo: required
 
 rvm:
 - ruby-head
-- 2.4.2
+- 2.5.0
+- 2.4.3
 - 2.3.5
-- 2.2.8
+- 2.2.9
 - 2.1.10
 
 env:
@@ -39,8 +40,10 @@ matrix:
     compiler: clang
     rvm: 2.4.1
     env: PYENV_VERSION=miniconda3-4.3.11
-  allow_failure:
+  allow_failures:
   - os: osx
+  - rvm: 2.2.9
+  - rvm: 2.1.10
 
 before_install:
 - gem update --system

data/CHANGES.md

@@ -1,5 +1,27 @@
 # The change history of PyCall
 
+## master
+
+* Add `PyCall::Tuple#to_ary`
+
+  *Naoto Takai*
+
+* Release GVL while the Python interpreter is running
+
+* Drop support Ruby 2.2.x and 2.1.x
+
+* Release GVL while the Python interpreter is running [Fix #45]
+
+* Add public header file
+
+* Use PyPtr.none? instead of removed PyCall.none?
+
+  *Kouhei Sutou*
+
+* Export PyObject convert functions
+
+  *Kouhei Sutou*
+
 ## 1.0.3
 
 * Fix anaconda support to define the environment variable `PYTHONHOME`.

data/README.md

@@ -1,7 +1,7 @@
 # PyCall: Calling Python functions from the Ruby language
 
-[![Build Status](https://travis-ci.org/mrkn/pycall.rb.svg?branch=1.0)](https://travis-ci.org/mrkn/pycall.rb)
-[![Build status](https://ci.appveyor.com/api/projects/status/naw56ldru71w7qsw/branch/1.0?svg=true)](https://ci.appveyor.com/project/mrkn/pycall-rb/branch/1.0)
+[![Build Status](https://travis-ci.org/mrkn/pycall.rb.svg?branch=master)](https://travis-ci.org/mrkn/pycall.rb)
+[![Build status](https://ci.appveyor.com/api/projects/status/071is0f4iu0vy8lp/branch/master?svg=true)](https://ci.appveyor.com/project/mrkn/pycall.rb/branch/master)
 
 This library provides the features to directly call and partially interoperate
 with Python from the Ruby language.  You can import arbitrary Python modules

data/Rakefile

@@ -17,6 +17,8 @@ Rake::ExtensionTask.new('pycall', gem_spec) do |ext|
   end
 end
 
+Rake::ExtensionTask.new('pycall/spec_helper')
+
 desc "Compile binaries for mingw platform using rake-compiler-dock"
 task 'build:mingw' do
   require 'rake_compiler_dock'

data/appveyor.yml

@@ -1,71 +1,37 @@
 ---
 environment:
   matrix:
-  # Ruby 2.1 (32bit)
-  - ruby_version: "21"
+  # Ruby 2.4 (32bit)
+  - ruby_version: "24"
     PYTHONDIR: "C:\\Python27"
     PYTHON: "C:\\Python27\\python.exe"
 
-  - ruby_version: "21"
+  - ruby_version: "24"
     PYTHONDIR: "C:\\Python34"
     PYTHON: "C:\\Python34\\python.exe"
 
-  - ruby_version: "21"
+  - ruby_version: "24"
     PYTHONDIR: "C:\\Python35"
     PYTHON: "C:\\Python35\\python.exe"
 
-  - ruby_version: "21"
+  - ruby_version: "24"
     PYTHONDIR: "C:\\Python36"
     PYTHON: "C:\\Python36\\python.exe"
 
-  # Ruby 2.1 (64bit)
-  - ruby_version: "21-x64"
+  # Ruby 2.4 (64bit)
+  - ruby_version: "24-x64"
     PYTHONDIR: "C:\\Python27-x64"
     PYTHON: "C:\\Python27-x64\\python.exe"
 
-  - ruby_version: "21-x64"
+  - ruby_version: "24-x64"
     PYTHONDIR: "C:\\Python34-x64"
     PYTHON: "C:\\Python34-x64\\python.exe"
 
-  - ruby_version: "21-x64"
+  - ruby_version: "24-x64"
     PYTHONDIR: "C:\\Python35-x64"
     PYTHON: "C:\\Python35-x64\\python.exe"
 
-  - ruby_version: "21-x64"
-    PYTHONDIR: "C:\\Python36-x64"
-    PYTHON: "C:\\Python36-x64\\python.exe"
-
-  # Ruby 2.2 (32bit)
-  - ruby_version: "22"
-    PYTHONDIR: "C:\\Python27"
-    PYTHON: "C:\\Python27\\python.exe"
-
-  - ruby_version: "22"
-    PYTHONDIR: "C:\\Python34"
-    PYTHON: "C:\\Python34\\python.exe"
-
-  - ruby_version: "22"
-    PYTHONDIR: "C:\\Python35"
-    PYTHON: "C:\\Python35\\python.exe"
-
-  - ruby_version: "22"
-    PYTHONDIR: "C:\\Python36"
-    PYTHON: "C:\\Python36\\python.exe"
-
-  # Ruby 2.2 (64bit)
-  - ruby_version: "22-x64"
-    PYTHONDIR: "C:\\Python27-x64"
-    PYTHON: "C:\\Python27-x64\\python.exe"
-
-  - ruby_version: "22-x64"
-    PYTHONDIR: "C:\\Python34-x64"
-    PYTHON: "C:\\Python34-x64\\python.exe"
-
-  - ruby_version: "22-x64"
-    PYTHONDIR: "C:\\Python35-x64"
-    PYTHON: "C:\\Python35-x64\\python.exe"
-
-  - ruby_version: "22-x64"
+  - ruby_version: "24-x64"
     PYTHONDIR: "C:\\Python36-x64"
     PYTHON: "C:\\Python36-x64\\python.exe"
 

data/ext/pycall/libpython.c

@@ -154,12 +154,16 @@ pycall_init_libpython_api_table(VALUE libpython_handle)
 
   INIT_API_TABLE_ENTRY(PyIter_Next, required);
 
+  INIT_API_TABLE_ENTRY(PyEval_ThreadsInitialized, required);
+  INIT_API_TABLE_ENTRY(PyEval_InitThreads, required);
+
   INIT_API_TABLE_ENTRY(PyErr_Occurred, required);
   INIT_API_TABLE_ENTRY(PyErr_Fetch, required);
   INIT_API_TABLE_ENTRY(PyErr_Restore, required);
   INIT_API_TABLE_ENTRY(PyErr_Clear, required);
   INIT_API_TABLE_ENTRY(PyErr_SetString, required);
   INIT_API_TABLE_ENTRY(PyErr_Format, required);
+  INIT_API_TABLE_ENTRY(PyErr_SetInterrupt, required);
 
   INIT_API_TABLE_ENTRY(PyImport_ImportModule, required);
   INIT_API_TABLE_ENTRY(PyImport_ImportModuleLevel, required);

data/ext/pycall/pycall.c

@@ -1,4 +1,5 @@
 #include "pycall_internal.h"
+#include "pycall.h"
 #include <ruby/encoding.h>
 
 #include <stdarg.h>
@@ -143,6 +144,12 @@ get_pyobj_ptr(VALUE obj)
   return pyobj;
 }
 
+PyObject *
+pycall_pyptr_get_pyobj_ptr(VALUE pyptr)
+{
+  return get_pyobj_ptr(pyptr);
+}
+
 static inline PyObject*
 try_get_pyobj_ptr(VALUE obj)
 {
@@ -727,7 +734,6 @@ pycall_libpython_helpers_m_compare(VALUE mod, VALUE op, VALUE pyptr_a, VALUE pyp
 }
 
 static int is_pyobject_wrapper(VALUE obj);
-static PyObject * pycall_pyobject_wrapper_get_pyobj_ptr(VALUE obj);
 
 VALUE
 pycall_getattr_default(VALUE obj, char const *name, VALUE default_value)
@@ -858,6 +864,42 @@ pycall_extract_kwargs_from_ruby_hash(VALUE key, VALUE value, VALUE arg)
   return ST_CONTINUE;
 }
 
+static void
+pycall_interrupt_python_thread(void *ptr)
+{
+  Py_API(PyErr_SetInterrupt)();
+}
+
+struct call_pyobject_call_params {
+  PyObject *pycallable;
+  PyObject *args;
+  PyObject *kwargs;
+};
+
+PyObject *
+call_pyobject_call(struct call_pyobject_call_params *params)
+{
+  PyObject *res;
+  res = Py_API(PyObject_Call)(params->pycallable, params->args, params->kwargs); /* New reference */
+  return res;
+}
+
+PyObject *
+pyobject_call_without_gvl(PyObject *pycallable, PyObject *args, PyObject *kwargs)
+{
+  PyObject *res;
+  struct call_pyobject_call_params params;
+  params.pycallable = pycallable;
+  params.args = args;
+  params.kwargs = kwargs;
+
+  res = (PyObject *)rb_thread_call_without_gvl(
+      (void * (*)(void *))call_pyobject_call, (void *)&params,
+      (rb_unblock_function_t *)pycall_interrupt_python_thread, NULL);
+
+  return res;
+}
+
 static VALUE
 pycall_call_python_callable(PyObject *pycallable, int argc, VALUE *argv)
 {
@@ -905,7 +947,7 @@ pycall_call_python_callable(PyObject *pycallable, int argc, VALUE *argv)
     }
   }
 
-  res = Py_API(PyObject_Call)(pycallable, args, kwargs); /* New reference */
+  res = pyobject_call_without_gvl(pycallable, args, kwargs); /* New reference */
   if (!res) {
     pycall_pyerror_fetch_and_raise("PyObject_Call in pycall_call_python_callable");
   }
@@ -1213,7 +1255,7 @@ pycall_pyobject_wrapper_get_pyptr(VALUE obj)
   return rb_funcall(obj, rb_intern("__pyptr__"), 0);
 }
 
-static PyObject *
+PyObject *
 pycall_pyobject_wrapper_get_pyobj_ptr(VALUE obj)
 {
   VALUE pyptr = pycall_pyobject_wrapper_get_pyptr(obj);
@@ -1947,6 +1989,10 @@ init_python(void)
   Py_API(Py_InitializeEx)(0);
   Py_API(PySys_SetArgvEx)(0, (char **)argv, 0);
 
+  if (!Py_API(PyEval_ThreadsInitialized)()) {
+    Py_API(PyEval_InitThreads)();
+  }
+
   /* check the availability of stackless extension */
   python_has_stackless_extension = (Py_API(PyImport_ImportModule)("stackless") != NULL);
   if (!python_has_stackless_extension) {
@@ -2078,6 +2124,7 @@ init_tuple(void)
   rb_define_singleton_method(cTuple, "new", pycall_tuple_s_new, -1);
   rb_define_method(cTuple, "length", pycall_tuple_length, 0);
   rb_define_method(cTuple, "to_a", pycall_tuple_to_a, 0);
+  rb_define_alias(cTuple, "to_ary", "to_a");
 }
 
 void

data/ext/pycall/pycall.h

@@ -0,0 +1,23 @@
+#ifndef PYCALL_H
+#define PYCALL_H 1
+
+#if defined(__cplusplus)
+extern "C" {
+#if 0
+} /* satisfy cc-mode */
+#endif
+#endif
+
+VALUE pycall_pyptr_new(PyObject *pyobj);
+PyObject *pycall_pyptr_get_pyobj_ptr(VALUE pyptr);
+VALUE pycall_pyobject_to_ruby(PyObject *pyobj);
+PyObject *pycall_pyobject_wrapper_get_pyobj_ptr(VALUE obj);
+
+#if defined(__cplusplus)
+#if 0
+{ /* satisfy cc-mode */
+#endif
+} /* extern "C" { */
+#endif
+
+#endif /* PYCALL_H */

data/ext/pycall/pycall_internal.h

@@ -10,6 +10,7 @@ extern "C" {
 
 #include <ruby.h>
 #include <ruby/encoding.h>
+#include <ruby/thread.h>
 #include <assert.h>
 #include <inttypes.h>
 #include <limits.h>
@@ -34,6 +35,9 @@ pycall_integer_type_p(VALUE obj)
 #endif
 
 void ruby_debug_breakpoint();
+int ruby_thread_has_gvl_p(void);
+
+#define CALL_WITH_GVL(func, data) rb_thread_call_with_gvl((void * (*)(void *))(func), (void *)(data))
 
 /* ==== python ==== */
 
@@ -581,12 +585,16 @@ typedef struct {
 
   PyObject * (* PyIter_Next)(PyObject *);
 
+  int (* PyEval_ThreadsInitialized)(void);
+  void (* PyEval_InitThreads)(void);
+
   PyObject * (* PyErr_Occurred)(void);
   void (* PyErr_Fetch)(PyObject **, PyObject **, PyObject **);
   void (* PyErr_Restore)(PyObject *, PyObject *, PyObject *);
   void (* PyErr_Clear)(void);
   void (* PyErr_SetString)(PyObject *, const char *);   /* decoded from utf-8 */
   void (* PyErr_Format)(PyObject *, const char *, ...); /* ASCII-encoded string  */
+  void (* PyErr_SetInterrupt)(void);
 
   PyObject * (* PyImport_ImportModule)(char const*);
   PyObject * (* PyImport_ImportModuleLevel)(char const*, PyObject *, PyObject *, PyObject *, int);
@@ -637,7 +645,6 @@ VALUE pycall_import_module_level(char const *name, VALUE globals, VALUE locals,
 VALUE pycall_getattr_default(VALUE pyobj, char const *name, VALUE default_value);
 VALUE pycall_getattr(VALUE pyobj, char const *name);
 
-VALUE pycall_pyobject_to_ruby(PyObject *);
 VALUE pycall_pytype_to_ruby(PyObject *);
 VALUE pycall_pymodule_to_ruby(PyObject *);
 VALUE pycall_pybool_to_ruby(PyObject *);

data/ext/pycall/ruby_wrapper.c

@@ -5,29 +5,30 @@ static PyMemberDef PyRuby_members[] = {
   {NULL} /* sentinel */
 };
 
-static void PyRuby_dealloc(PyRubyObject *);
-static PyObject * PyRuby_repr(PyRubyObject *);
-static PyObject * PyRuby_call(PyRubyObject *, PyObject *, PyObject *);
-static PyObject * PyRuby_getattro(PyRubyObject *, PyObject *);
+static VALUE PyRuby_get_ruby_object_and_set_pyerr(PyObject *pyobj);
+static void PyRuby_dealloc_with_gvl(PyRubyObject *);
+static PyObject * PyRuby_repr_with_gvl(PyRubyObject *);
+static PyObject * PyRuby_call_with_gvl(PyRubyObject *, PyObject *, PyObject *);
+static PyObject * PyRuby_getattro_with_gvl(PyRubyObject *, PyObject *);
 
 PyTypeObject PyRuby_Type = {
   PyVarObject_HEAD_INIT(NULL, 0)
   "PyCall.ruby_object", /* tp_name */
   sizeof(PyRubyObject), /* tp_basicsize */
   0, /* tp_itemsize */
-  (destructor)PyRuby_dealloc,    /* tp_dealloc */
+  (destructor)PyRuby_dealloc_with_gvl, /* tp_dealloc */
   0,                             /* tp_print */
   0,                             /* tp_getattr */
   0,                             /* tp_setattr */
   0,                             /* tp_reserved */
-  (reprfunc)PyRuby_repr,         /* tp_repr */
+  (reprfunc)PyRuby_repr_with_gvl, /* tp_repr */
   0,                             /* tp_as_number */
   0,                             /* tp_as_sequence */
   0,                             /* tp_as_mapping */
   {0},                           /* tp_hash  */
-  (ternaryfunc)PyRuby_call,      /* tp_call */
+  (ternaryfunc)PyRuby_call_with_gvl, /* tp_call */
   0,                             /* tp_str */
-  (getattrofunc)PyRuby_getattro, /* tp_getattro */
+  (getattrofunc)PyRuby_getattro_with_gvl, /* tp_getattro */
   0,                             /* tp_setattro */
   0,                             /* tp_as_buffer */
   Py_TPFLAGS_BASETYPE,           /* tp_flags */
@@ -42,8 +43,8 @@ PyTypeObject PyRuby_Type = {
   PyRuby_members,                /*tp_members*/
 };
 
-PyObject *
-PyRuby_New(VALUE ruby_object)
+static PyObject *
+PyRuby_New_impl(VALUE ruby_object)
 {
   PyRubyObject *op;
 
@@ -53,59 +54,17 @@ PyRuby_New(VALUE ruby_object)
   return (PyObject *)op;
 }
 
-static VALUE
-funcall_id2ref(VALUE object_id)
-{
-  VALUE rb_mObjSpace;
-  object_id = rb_check_to_integer(object_id, "to_int");
-  rb_mObjSpace = rb_const_get(rb_cObject, rb_intern("ObjectSpace"));
-  return rb_funcall(rb_mObjSpace, rb_intern("_id2ref"), 1, object_id);
-}
-
-static VALUE
-protect_id2ref(VALUE object_id)
-{
-  VALUE obj;
-  int state;
-
-  obj = rb_protect((VALUE (*)(VALUE))funcall_id2ref, object_id, &state);
-  if (state)
-    return Qundef;
-
-  return obj;
-}
-
-static VALUE
-protect_id2ref_and_set_pyerr(VALUE object_id)
+PyObject *
+PyRuby_New(VALUE ruby_object)
 {
-  VALUE obj = protect_id2ref(object_id);
-  if (obj != Qundef)
-    return obj;
-
-  obj = rb_errinfo();
-  if (RTEST(rb_obj_is_kind_of(obj, rb_eRangeError))) {
-    Py_API(PyErr_SetString)(Py_API(PyExc_RuntimeError), "[BUG] referenced object was garbage-collected");
+  if (!ruby_thread_has_gvl_p()) {
+    CALL_WITH_GVL(PyRuby_New_impl, ruby_object);
   }
-  else {
-    VALUE emesg = rb_check_funcall(obj, rb_intern("message"), 0, 0);
-    Py_API(PyErr_Format)(Py_API(PyExc_RuntimeError),
-        "[BUG] Unable to obtain ruby object from ID: %s (%s)",
-        StringValueCStr(emesg), rb_class2name(CLASS_OF(obj)));
-  }
-  return Qundef;
-}
 
-static VALUE
-PyRuby_get_ruby_object_and_set_pyerr(PyObject *pyobj)
-{
-  VALUE obj_id;
-  if (!PyRuby_Check(pyobj))
-    return Qundef;
-  obj_id = rb_obj_id(PyRuby_get_ruby_object(pyobj));
-  return protect_id2ref_and_set_pyerr(obj_id);
+  return PyRuby_New_impl(ruby_object);
 }
 
-static void
+static void *
 PyRuby_dealloc(PyRubyObject *pyro)
 {
   VALUE obj;
@@ -117,9 +76,20 @@ PyRuby_dealloc(PyRubyObject *pyro)
 #endif /* PYCALL_DEBUG_DUMP_REFCNT */
 
   if (obj == Qundef)
-    return;
+    return NULL;
 
   pycall_gcguard_unregister_pyrubyobj((PyObject *)pyro);
+
+  return NULL;
+}
+
+static void
+PyRuby_dealloc_with_gvl(PyRubyObject *pyro)
+{
+  if (!ruby_thread_has_gvl_p()) {
+    CALL_WITH_GVL(PyRuby_dealloc, pyro);
+  }
+  PyRuby_dealloc(pyro);
 }
 
 static PyObject *
@@ -137,6 +107,15 @@ PyRuby_repr(PyRubyObject *pyro)
   return res;
 }
 
+static PyObject *
+PyRuby_repr_with_gvl(PyRubyObject *pyro)
+{
+  if (!ruby_thread_has_gvl_p()) {
+    return CALL_WITH_GVL(PyRuby_repr, pyro);
+  }
+  return PyRuby_repr(pyro);
+}
+
 #if SIZEOF_SSIZE_T < 8
 /* int64to32hash from src/support/hashing.c in Julia */
 static inline uint32_t
@@ -152,7 +131,7 @@ int64to32hash(uint64_t key)
 }
 #endif
 
-static long
+static void *
 PyRuby_hash_long(PyRubyObject *pyro)
 {
   VALUE obj, rbhash;
@@ -160,15 +139,24 @@ PyRuby_hash_long(PyRubyObject *pyro)
 
   obj = PyRuby_get_ruby_object_and_set_pyerr((PyObject *)pyro);
   if (obj == Qundef)
-    return -1;
+    return (void *)-1;
 
   rbhash = rb_hash(obj);
   h = FIX2LONG(rbhash); /* Ruby's hash value is a Fixnum */
 
-  return h == -1 ? pycall_hash_salt : h;
+  return (void *)(h == -1 ? pycall_hash_salt : h);
 }
 
-static Py_hash_t
+static long
+PyRuby_hash_long_with_gvl(PyRubyObject *pyro)
+{
+  if (!ruby_thread_has_gvl_p()) {
+    return (long)CALL_WITH_GVL(PyRuby_hash_long, pyro);
+  }
+  return (long)PyRuby_hash_long(pyro);
+}
+
+static void *
 PyRuby_hash_hash_t(PyRubyObject *pyro)
 {
   VALUE obj, rbhash;
@@ -176,20 +164,29 @@ PyRuby_hash_hash_t(PyRubyObject *pyro)
 
   obj = PyRuby_get_ruby_object_and_set_pyerr((PyObject *)pyro);
   if (obj == Qundef)
-    return -1;
+    return (void *)-1;
 
   rbhash = rb_hash(obj);
 #if SIZEOF_PY_HASH_T == SIZEOF_LONG
   /* In this case, we can assume sizeof(Py_hash_t) == sizeof(long) */
   h = NUM2SSIZET(rbhash);
-  return h == -1 ? (Py_hash_t)pycall_hash_salt : h;
+  return (void *)(h == -1 ? (Py_hash_t)pycall_hash_salt : h);
 #else
   /* In this case, we can assume sizeof(long) == 4 and sizeof(Py_hash_t) == 8 */
   h = (pycall_hash_salt_32 << 32) | FIX2LONG(rbhash);
-  return h == -1 ? ((pycall_hash_salt << 32) | pycall_hash_salt) : h;
+  return (void *)(h == -1 ? ((pycall_hash_salt << 32) | pycall_hash_salt) : h);
 #endif
 }
 
+static Py_hash_t
+PyRuby_hash_hash_t_with_gvl(PyRubyObject *pyro)
+{
+  if (!ruby_thread_has_gvl_p()) {
+    return (Py_hash_t)CALL_WITH_GVL(PyRuby_hash_hash_t, pyro);
+  }
+  return (Py_hash_t)PyRuby_hash_hash_t(pyro);
+}
+
 struct call_rb_funcallv_params {
   VALUE recv;
   ID meth;
@@ -221,15 +218,21 @@ rb_protect_funcallv(VALUE recv, ID meth, int argc, VALUE *argv, int *pstate)
   return res;
 }
 
+struct PyRuby_call_params {
+  PyRubyObject *pyro;
+  PyObject *pyobj_args;
+  PyObject *pyobj_kwargs;
+};
+
 static PyObject *
-PyRuby_call(PyRubyObject *pyro, PyObject *pyobj_args, PyObject *pyobj_kwargs)
+PyRuby_call(struct PyRuby_call_params *params)
 {
   ID id_call;
   VALUE obj, args, kwargs, res;
   PyObject *pyobj_res;
   int state;
 
-  obj = PyRuby_get_ruby_object_and_set_pyerr((PyObject *)pyro);
+  obj = PyRuby_get_ruby_object_and_set_pyerr((PyObject *)params->pyro);
   if (obj == Qundef)
     return NULL;
 
@@ -239,9 +242,9 @@ PyRuby_call(PyRubyObject *pyro, PyObject *pyobj_args, PyObject *pyobj_kwargs)
     return NULL;
   }
 
-  args = pycall_pyobject_to_a(pyobj_args);
-  if (pyobj_kwargs) {
-    kwargs = pycall_pyobject_to_ruby(pyobj_kwargs);
+  args = pycall_pyobject_to_a(params->pyobj_args);
+  if (params->pyobj_kwargs) {
+    kwargs = pycall_pyobject_to_ruby(params->pyobj_kwargs);
     rb_ary_push(args, kwargs);
   }
 
@@ -255,18 +258,38 @@ PyRuby_call(PyRubyObject *pyro, PyObject *pyobj_args, PyObject *pyobj_kwargs)
 }
 
 static PyObject *
-PyRuby_getattro(PyRubyObject *pyro, PyObject *pyobj_name)
+PyRuby_call_with_gvl(PyRubyObject *pyro, PyObject *pyobj_args, PyObject *pyobj_kwargs)
+{
+  struct PyRuby_call_params params;
+  params.pyro = pyro;
+  params.pyobj_args = pyobj_args;
+  params.pyobj_kwargs = pyobj_kwargs;
+
+  if (!ruby_thread_has_gvl_p()) {
+    return CALL_WITH_GVL(PyRuby_call, &params);
+  }
+
+  return PyRuby_call(&params);
+}
+
+struct PyRuby_getattro_params {
+  PyRubyObject *pyro;
+  PyObject *pyobj_name;
+};
+
+static PyObject *
+PyRuby_getattro(struct PyRuby_getattro_params *params)
 {
   VALUE obj, name, res;
   char const *name_cstr;
   ID name_id;
   PyObject *pyobj_res;
 
-  obj = PyRuby_get_ruby_object_and_set_pyerr((PyObject *)pyro);
+  obj = PyRuby_get_ruby_object_and_set_pyerr((PyObject *)params->pyro);
   if (obj == Qundef)
     return NULL;
 
-  name = pycall_pyobject_to_ruby(pyobj_name);
+  name = pycall_pyobject_to_ruby(params->pyobj_name);
   name_cstr = StringValueCStr(name);
   name_id = rb_intern(name_cstr);
 
@@ -299,21 +322,35 @@ PyRuby_getattro(PyRubyObject *pyro, PyObject *pyobj_name)
   else if (name_cstr[0] == '_' && name_cstr[1] == '_') {
     /* name.start_with? "__" */
     /* TODO: handle `__code__` and `func_code` */
-    return Py_API(PyObject_GenericGetAttr)((PyObject *)pyro, pyobj_name);
+    return Py_API(PyObject_GenericGetAttr)((PyObject *)params->pyro, params->pyobj_name);
   }
   else {
     /* TODO: handle `__code__` and `func_code` */
     if (rb_respond_to(obj, name_id)) {
       VALUE method = rb_obj_method(obj, name);
-      return PyRuby_New(method);
+      return PyRuby_New_impl(method);
     }
-    return Py_API(PyObject_GenericGetAttr)((PyObject *)pyro, pyobj_name);
+    return Py_API(PyObject_GenericGetAttr)((PyObject *)params->pyro, params->pyobj_name);
   }
 
   pyobj_res = pycall_pyobject_from_ruby(res);
   return pyobj_res;
 }
 
+static PyObject *
+PyRuby_getattro_with_gvl(PyRubyObject *pyro, PyObject *pyobj_name)
+{
+  struct PyRuby_getattro_params params;
+  params.pyro = pyro;
+  params.pyobj_name = pyobj_name;
+
+  if (!ruby_thread_has_gvl_p()) {
+    return CALL_WITH_GVL(PyRuby_getattro, &params);
+  }
+
+  return PyRuby_getattro(&params);
+}
+
 /* ==== PyCall::PyRubyPtr ==== */
 
 VALUE cPyRubyPtr;
@@ -411,9 +448,9 @@ pycall_init_ruby_wrapper(void)
   PyRuby_Type.tp_flags |= pycall_default_tp_flags();
   PyRuby_Type.tp_new = Py_API(PyType_GenericNew);
   if (pycall_python_long_hash)
-    PyRuby_Type.tp_hash._long = (hashfunc_long)PyRuby_hash_long;
+    PyRuby_Type.tp_hash._long = (hashfunc_long)PyRuby_hash_long_with_gvl;
   else
-    PyRuby_Type.tp_hash._hash_t = (hashfunc_hash_t)PyRuby_hash_hash_t;
+    PyRuby_Type.tp_hash._hash_t = (hashfunc_hash_t)PyRuby_hash_hash_t_with_gvl;
 
   if (Py_API(PyType_Ready)(&PyRuby_Type) < 0) {
     pycall_pyerror_fetch_and_raise("PyType_Ready in pycall_init_ruby_wrapper");
@@ -430,3 +467,57 @@ pycall_init_ruby_wrapper(void)
 
   rb_define_module_function(mPyCall, "wrap_ruby_object", pycall_m_wrap_ruby_object, 1);
 }
+
+/* --- File internal utilities --- */
+
+static VALUE
+funcall_id2ref(VALUE object_id)
+{
+  VALUE rb_mObjSpace;
+  object_id = rb_check_to_integer(object_id, "to_int");
+  rb_mObjSpace = rb_const_get(rb_cObject, rb_intern("ObjectSpace"));
+  return rb_funcall(rb_mObjSpace, rb_intern("_id2ref"), 1, object_id);
+}
+
+static VALUE
+protect_id2ref(VALUE object_id)
+{
+  VALUE obj;
+  int state;
+
+  obj = rb_protect((VALUE (*)(VALUE))funcall_id2ref, object_id, &state);
+  if (state)
+    return Qundef;
+
+  return obj;
+}
+
+static VALUE
+protect_id2ref_and_set_pyerr(VALUE object_id)
+{
+  VALUE obj = protect_id2ref(object_id);
+  if (obj != Qundef)
+    return obj;
+
+  obj = rb_errinfo();
+  if (RTEST(rb_obj_is_kind_of(obj, rb_eRangeError))) {
+    Py_API(PyErr_SetString)(Py_API(PyExc_RuntimeError), "[BUG] referenced object was garbage-collected");
+  }
+  else {
+    VALUE emesg = rb_check_funcall(obj, rb_intern("message"), 0, 0);
+    Py_API(PyErr_Format)(Py_API(PyExc_RuntimeError),
+        "[BUG] Unable to obtain ruby object from ID: %s (%s)",
+        StringValueCStr(emesg), rb_class2name(CLASS_OF(obj)));
+  }
+  return Qundef;
+}
+
+static VALUE
+PyRuby_get_ruby_object_and_set_pyerr(PyObject *pyobj)
+{
+  VALUE obj_id;
+  if (!PyRuby_Check(pyobj))
+    return Qundef;
+  obj_id = rb_obj_id(PyRuby_get_ruby_object(pyobj));
+  return protect_id2ref_and_set_pyerr(obj_id);
+}

data/lib/pycall/conversion.rb

@@ -32,7 +32,7 @@ module PyCall
     #
     # @return a Ruby object converted from `pyptr`.
     def self.to_ruby(pyptr)
-      return nil if pyptr.null? || PyCall.none?(pyptr)
+      return nil if pyptr.null? || pyptr.none?
 
       case
       when PyCall::Types.pyisinstance(pyptr, LibPython.PyType_Type)

data/lib/pycall/version.rb

@@ -1,3 +1,3 @@
 module PyCall
-  VERSION = "1.0.3"
+  VERSION = "1.1.0.rc1"
 end

data/pycall.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     case f
     when %r{^Guardfile},  # NOTE: Skip symlink for Windows
+         %r{^ext/pycall/spec_helper/},
          %r{^(test|spec|features)/}
       true
     else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pycall
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0.rc1
 platform: ruby
 authors:
 - Kenta Murata
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-22 00:00:00.000000000 Z
+date: 2018-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -167,6 +167,7 @@ files:
 - ext/pycall/gc.c
 - ext/pycall/libpython.c
 - ext/pycall/pycall.c
+- ext/pycall/pycall.h
 - ext/pycall/pycall_internal.h
 - ext/pycall/range.c
 - ext/pycall/ruby_wrapper.c
@@ -213,12 +214,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: pycall