Merge remote-tracking branch 'remotes/upstream/master' into soft-shut…

…down
pythonnet · lostmsu · Oct 8, 2020 · Jun 13, 2019 · Jun 13, 2019 · Jun 13, 2019
commit 5387b051da9d7b540fea9b7ebeea191cc5e395fc
diff --git a/src/embed_tests/pyimport.cs b/src/embed_tests/pyimport.cs
@@ -38,8 +38,8 @@ public void SetUp()
             string testPath = Path.Combine(TestContext.CurrentContext.TestDirectory, s);
 
             IntPtr str = Runtime.Runtime.PyString_FromString(testPath);
-            IntPtr path = Runtime.Runtime.PySys_GetObject("path");
-            Runtime.Runtime.PyList_Append(new BorrowedReference(path), str);
+            BorrowedReference path = Runtime.Runtime.PySys_GetObject("path");
+            Runtime.Runtime.PyList_Append(path, str);
             Runtime.Runtime.XDecref(str);
         }
 

diff --git a/src/runtime/BorrowedReference.cs b/src/runtime/BorrowedReference.cs
@@ -11,8 +11,7 @@ readonly ref struct BorrowedReference
         public bool IsNull => this.pointer == IntPtr.Zero;
 
         /// <summary>Gets a raw pointer to the Python object</summary>
-        public IntPtr DangerousGetAddress()
-            => this.IsNull ? throw new NullReferenceException() : this.pointer;
+        public IntPtr DangerousGetAddress() => this.pointer;
 
         /// <summary>
         /// Creates new instance of <see cref="BorrowedReference"/> from raw pointer. Unsafe.

diff --git a/src/runtime/Python.Runtime.15.csproj b/src/runtime/Python.Runtime.15.csproj
@@ -90,7 +90,7 @@
     <DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON2;$(Python2Version);$(PythonWinDefineConstants);FINALIZER_CHECK;TRACE;DEBUG</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'DebugWinPY3'">
-    <DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON3;$(Python3Version);$(PythonWinDefineConstants);FINALIZER_CHECK;TRACE;DEBUG</DefineConstants>
+    <DefineConstants Condition="'$(CustomDefineConstants)' == ''">TRACE;DEBUG;XPLAT;;PYTHON3;PYTHON38;UCS2;FINALIZER_CHECK;WINDOWS</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup Condition=" '$(PythonInteropFile)' != '' ">

diff --git a/src/runtime/Python.Runtime.csproj b/src/runtime/Python.Runtime.csproj
@@ -89,6 +89,7 @@
     <Compile Include="arrayobject.cs" />
     <Compile Include="assemblymanager.cs" />
     <Compile Include="BorrowedReference.cs" />
+    <Compile Include="bufferinterface.cs" />
     <Compile Include="classderived.cs" />
     <Compile Include="classbase.cs" />
     <Compile Include="classmanager.cs" />
@@ -130,6 +131,7 @@
     <Compile Include="overload.cs" />
     <Compile Include="propertyobject.cs" />
     <Compile Include="pyansistring.cs" />
+    <Compile Include="pybuffer.cs" />
     <Compile Include="pydict.cs" />
     <Compile Include="PyExportAttribute.cs" />
     <Compile Include="pyfloat.cs" />

diff --git a/src/runtime/runtime.cs b/src/runtime/runtime.cs
@@ -98,6 +98,9 @@ public class Runtime
         // .NET core: System.Runtime.InteropServices.RuntimeInformation.IsOSPlatform(OSPlatform.Windows)
         internal static bool IsWindows = Environment.OSVersion.Platform == PlatformID.Win32NT;
 
+        internal static Version InteropVersion { get; }
+            = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
+
         public static int MainManagedThreadId { get; private set; }
 
         /// <summary>
@@ -198,7 +201,7 @@ internal static void Initialize(bool initSigs = false, ShutdownMode mode = Shutd
             // Need to add the runtime directory to sys.path so that we
             // can find built-in assemblies like System.Data, et. al.
             string rtdir = RuntimeEnvironment.GetRuntimeDirectory();
-            IntPtr path = PySys_GetObject("path");
+            IntPtr path = PySys_GetObject("path").DangerousGetAddress();
             IntPtr item = PyString_FromString(rtdir);
             if (PySequence_Contains(path, item) == 0)
             {
@@ -452,10 +455,10 @@ private static void ClearClrModules()
         {
             var modules = PyImport_GetModuleDict();
             var items = PyDict_Items(modules);
-            long length = PyList_Size(items.DangerousGetAddress());
+            long length = PyList_Size(items);
             for (long i = 0; i < length; i++)
             {
-                var item = PyList_GetItem(items.DangerousGetAddress(), i);
+                var item = PyList_GetItem(items, i);
                 var name = PyTuple_GetItem(item.DangerousGetAddress(), 0);
                 var module = PyTuple_GetItem(item.DangerousGetAddress(), 1);
                 if (ManagedType.IsManagedType(module))
@@ -1107,6 +1110,37 @@ internal static long PyObject_Size(IntPtr pointer)
         internal static extern void _Py_NewReference(IntPtr ob);
 #endif
 
+        //====================================================================
+        // Python buffer API
+        //====================================================================
+
+        [DllImport(_PythonDll, CallingConvention = CallingConvention.Cdecl)]
+        internal static extern int PyObject_GetBuffer(IntPtr exporter, ref Py_buffer view, int flags);
+
+        [DllImport(_PythonDll, CallingConvention = CallingConvention.Cdecl)]
+        internal static extern void PyBuffer_Release(ref Py_buffer view);
+
+        [DllImport(_PythonDll, CallingConvention = CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        internal static extern IntPtr PyBuffer_SizeFromFormat([MarshalAs(UnmanagedType.LPStr)] string format);
+
+        [DllImport(_PythonDll, CallingConvention = CallingConvention.Cdecl)]
+        internal static extern int PyBuffer_IsContiguous(ref Py_buffer view, char order);
+
+        [DllImport(_PythonDll, CallingConvention = CallingConvention.Cdecl)]
+        internal static extern IntPtr PyBuffer_GetPointer(ref Py_buffer view, IntPtr[] indices);
+
+        [DllImport(_PythonDll, CallingConvention = CallingConvention.Cdecl)]
+        internal static extern int PyBuffer_FromContiguous(ref Py_buffer view, IntPtr buf, IntPtr len, char fort);
+
+        [DllImport(_PythonDll, CallingConvention = CallingConvention.Cdecl)]
+        internal static extern int PyBuffer_ToContiguous(IntPtr buf, ref Py_buffer src, IntPtr len, char order);
+
+        [DllImport(_PythonDll, CallingConvention = CallingConvention.Cdecl)]
+        internal static extern void PyBuffer_FillContiguousStrides(int ndims, IntPtr shape, IntPtr strides, int itemsize, char order);
+
+        [DllImport(_PythonDll, CallingConvention = CallingConvention.Cdecl)]
+        internal static extern int PyBuffer_FillInfo(ref Py_buffer view, IntPtr exporter, IntPtr buf, IntPtr len, int _readonly, int flags);
+
         //====================================================================
         // Python number API
         //====================================================================

diff --git a/src/runtime/runtime_data.cs b/src/runtime/runtime_data.cs
@@ -70,7 +70,7 @@ internal static void Stash()
             Marshal.WriteIntPtr(mem, (IntPtr)ms.Length);
             Marshal.Copy(data, 0, mem + IntPtr.Size, (int)ms.Length);
 
-            IntPtr capsule = PySys_GetObject("clr_data");
+            IntPtr capsule = PySys_GetObject("clr_data").DangerousGetAddress();
             if (capsule != IntPtr.Zero)
             {
                 IntPtr oldData = PyCapsule_GetPointer(capsule, null);
@@ -96,7 +96,7 @@ internal static void StashPop()
 
         private static void StashPopImpl()
         {
-            IntPtr capsule = PySys_GetObject("clr_data");
+            IntPtr capsule = PySys_GetObject("clr_data").DangerousGetAddress();
             if (capsule == IntPtr.Zero)
             {
                 return;
@@ -129,7 +129,7 @@ private static void StashPopImpl()
 
         public static bool HasStashData()
         {
-            return PySys_GetObject("clr_data") != IntPtr.Zero;
+            return !PySys_GetObject("clr_data").IsNull;
         }
 
         public static void ClearStash()
@@ -248,8 +248,7 @@ private static Dictionary<ManagedType, PyObjectSerializeContext> StashPopObjects
         private static void StashPushModules(RuntimeDataStorage storage)
         {
             var pyModules = PyImport_GetModuleDict();
-            var itemsRef = PyDict_Items(pyModules);
-            var items = itemsRef.DangerousGetAddress();
+            var items = PyDict_Items(pyModules);
             long length = PyList_Size(items);
             var modules = new Dictionary<IntPtr, IntPtr>(); ;
             for (long i = 0; i < length; i++)
@@ -264,7 +263,7 @@ private static void StashPushModules(RuntimeDataStorage storage)
                     modules.Add(name, module);
                 }
             }
-            itemsRef.Dispose();
+            items.Dispose();
             storage.AddValue("modules", modules);
         }
 

diff --git a/src/runtime/runtime_state.cs b/src/runtime/runtime_state.cs
@@ -14,7 +14,7 @@ class RuntimeState
 
         public static void Save()
         {
-            if (PySys_GetObject("dummy_gc") != IntPtr.Zero)
+            if (!PySys_GetObject("dummy_gc").IsNull)
             {
                 throw new Exception("Runtime State set already");
             }
@@ -79,7 +79,7 @@ public static void Save()
 
         public static void Restore()
         {
-            var dummyGCAddr = PySys_GetObject("dummy_gc");
+            var dummyGCAddr = PySys_GetObject("dummy_gc").DangerousGetAddress();
             if (dummyGCAddr == IntPtr.Zero)
             {
                 throw new InvalidOperationException("Runtime state have not set");
@@ -95,11 +95,11 @@ public static void Restore()
         private static void ResotreModules(IntPtr dummyGC)
         {
             var intialModules = PySys_GetObject("initial_modules");
-            Debug.Assert(intialModules != IntPtr.Zero);
+            Debug.Assert(!intialModules.IsNull);
             var modules = PyImport_GetModuleDict();
             foreach (var name in GetModuleNames())
             {
-                if (PySet_Contains(intialModules, name) == 1)
+                if (PySet_Contains(intialModules.DangerousGetAddress(), name) == 1)
                 {
                     continue;
                 }
@@ -122,7 +122,7 @@ private static void RestoreObjects(IntPtr dummyGC)
             {
                 throw new Exception("To prevent crash by _PyObject_GC_UNTRACK in Python internal, UseDummyGC should be enabled when using ResotreObjects");
             }
-            IntPtr intialObjs = PySys_GetObject("initial_objs");
+            IntPtr intialObjs = PySys_GetObject("initial_objs").DangerousGetAddress();
             Debug.Assert(intialObjs != IntPtr.Zero);
             foreach (var obj in PyGCGetObjects())
             {
@@ -149,10 +149,10 @@ public static IEnumerable<IntPtr> PyGCGetObjects()
             PythonException.ThrowIfIsNull(gc);
             var get_objects = PyObject_GetAttrString(gc, "get_objects");
             var objs = PyObject_CallObject(get_objects, IntPtr.Zero);
-            var length = PyList_Size(objs);
+            var length = PyList_Size(new BorrowedReference(objs));
             for (long i = 0; i < length; i++)
             {
-                var obj = PyList_GetItem(objs, i);
+                var obj = PyList_GetItem(new BorrowedReference(objs), i);
                 yield return obj.DangerousGetAddress();
             }
             XDecref(objs);
@@ -163,10 +163,10 @@ public static IEnumerable<IntPtr> GetModuleNames()
         {
             var modules = PyImport_GetModuleDict();
             var names = PyDict_Keys(modules);
-            var length = PyList_Size(names);
+            var length = PyList_Size(new BorrowedReference(names));
             for (int i = 0; i < length; i++)
             {
-                var name = PyList_GetItem(names, i);
+                var name = PyList_GetItem(new BorrowedReference(names), i);
                 yield return name.DangerousGetAddress();
             }
             XDecref(names);