Use pointer to have PyArray_Type in global scope

to avoid copy

Author: kngwyu

Cargo.toml

@@ -15,5 +15,5 @@ num-complex = "0.1"
 ndarray = "0.10"
 
 [dependencies.pyo3]
-git = "https://github.com/PyO3/pyo3.git"
-rev = "c22bec6124ab68f47a7f28550931e3060f89071b"
+git = "https://github.com/PyO3/pyo3"
+rev = "4169b0317826dc62eafcdd0faab7d009f6808c06"

src/array.rs

@@ -12,7 +12,7 @@ use super::*;
 
 /// Untyped safe interface for NumPy ndarray.
 pub struct PyArray(PyObject);
-pyobject_native_type!(PyArray, npyffi::PyArray_Type_Global, npyffi::PyArray_Check);
+pyobject_native_type!(PyArray, *npyffi::PyArray_Type_Ptr, npyffi::PyArray_Check);
 
 impl PyArray {
     pub fn as_array_ptr(&self) -> *mut npyffi::PyArrayObject {

src/npyffi/array.rs

@@ -26,7 +26,7 @@ pub struct PyArrayModule<'py> {
 }
 
 #[allow(non_upper_case_globals)]
-pub static mut PyArray_Type_Global: PyTypeObject = ffi::PyTypeObject_INIT;
+pub static mut PyArray_Type_Ptr: *mut PyTypeObject = null_mut();
 
 impl<'py> Deref for PyArrayModule<'py> {
     type Target = PyModule;
@@ -55,7 +55,7 @@ impl<'py> PyArrayModule<'py> {
         };
         let mod_ = PyArrayModule { numpy, api };
         unsafe {
-            PyArray_Type_Global = *mod_.get_type_object(ArrayType::PyArray_Type);
+            PyArray_Type_Ptr = mod_.get_type_object(ArrayType::PyArray_Type);
         }
         Ok(mod_)
     }
@@ -378,12 +378,10 @@ impl_array_type!(
 
 #[allow(non_snake_case)]
 pub unsafe fn PyArray_Check(op: *mut PyObject) -> c_int {
-    let typeobj_ptr: *mut PyTypeObject = &mut PyArray_Type_Global;
-    ffi::PyObject_TypeCheck(op, typeobj_ptr)
+    ffi::PyObject_TypeCheck(op, PyArray_Type_Ptr)
 }
 
 #[allow(non_snake_case)]
 pub unsafe fn PyArray_CheckExact(op: *mut PyObject) -> c_int {
-    let typeobj_ptr: *mut _ = &mut PyArray_Type_Global;
-    (ffi::Py_TYPE(op) == typeobj_ptr) as c_int
+    (ffi::Py_TYPE(op) == PyArray_Type_Ptr) as c_int
 }