Merge branch 'master' into weakref-support

amos402 · amos402 · commit 647bc8a8435d · 2021-02-21T16:25:08.000+08:00
diff --git a/README.rst b/README.rst
@@ -5,7 +5,11 @@ pythonnet - Python.NET
 
 |gh shield| |appveyor shield|
 
-|license shield| |pypi package version| |conda-forge version| |python supported shield|
+|license shield|
+
+|pypi package version| |conda-forge version| |python supported shield|
+
+|nuget preview shield| |nuget release shield|
 
 Python.NET is a package that gives Python programmers nearly
 seamless integration with the .NET Common Language Runtime (CLR) and
@@ -41,6 +45,8 @@ module:
 Embedding Python in .NET
 ------------------------
 
+-  You must set `Runtime.PythonDLL` or `PYTHONNET_PYDLL` environment variable
+   starting with version 3.0, otherwise you will receive `TypeInitializationException`.
 -  All calls to python should be inside a
    ``using (Py.GIL()) {/* Your code here */}`` block.
 -  Import python modules using ``dynamic mod = Py.Import("mod")``, then
@@ -130,5 +136,9 @@ This project is supported by the `.NET Foundation <https://dotnetfoundation.org>
    :target: http://stackoverflow.com/questions/tagged/python.net
 .. |conda-forge version| image:: https://img.shields.io/conda/vn/conda-forge/pythonnet.svg
    :target: https://anaconda.org/conda-forge/pythonnet
+.. |nuget preview shield| image:: https://img.shields.io/nuget/vpre/pythonnet
+   :target: https://www.nuget.org/packages/pythonnet/
+.. |nuget release shield| image:: https://img.shields.io/nuget/v/pythonnet
+   :target: https://www.nuget.org/packages/pythonnet/
 .. |gh shield| image:: https://github.com/pythonnet/pythonnet/workflows/GitHub%20Actions/badge.svg
    :target: https://github.com/pythonnet/pythonnet/actions?query=branch%3Amaster
diff --git a/src/embed_tests/TestInterrupt.cs b/src/embed_tests/TestInterrupt.cs
@@ -1,5 +1,5 @@
-
 using System;
+using System.Diagnostics;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -30,34 +30,35 @@ public void Dispose()
         [Test]
         public void InterruptTest()
         {
-            int runSimpleStringReturnValue = int.MinValue;
-            ulong pythonThreadID = ulong.MinValue;
-            Task.Factory.StartNew(() =>
+            long pythonThreadID = 0;
+            var asyncCall = Task.Factory.StartNew(() =>
             {
                 using (Py.GIL())
                 {
-                    pythonThreadID = PythonEngine.GetPythonThreadID();
-                    runSimpleStringReturnValue = PythonEngine.RunSimpleString(@"
+                    Interlocked.Exchange(ref pythonThreadID, (long)PythonEngine.GetPythonThreadID());
+                    return PythonEngine.RunSimpleString(@"
 import time
 
 while True:
     time.sleep(0.2)");
                 }
             });
 
-            Thread.Sleep(200);
-
-            Assert.AreNotEqual(ulong.MinValue, pythonThreadID);
+            var timeout = Stopwatch.StartNew();
+            while (Interlocked.Read(ref pythonThreadID) == 0)
+            {
+                Assert.Less(timeout.Elapsed, TimeSpan.FromSeconds(5), "thread ID was not assigned in time");
+            }
 
             using (Py.GIL())
             {
-                int interruptReturnValue = PythonEngine.Interrupt(pythonThreadID);
+                int interruptReturnValue = PythonEngine.Interrupt((ulong)Interlocked.Read(ref pythonThreadID));
                 Assert.AreEqual(1, interruptReturnValue);
             }
 
-            Thread.Sleep(300);
+            Assert.IsTrue(asyncCall.Wait(TimeSpan.FromSeconds(5)), "Async thread was not interrupted in time");
 
-            Assert.AreEqual(-1, runSimpleStringReturnValue);
+            Assert.AreEqual(-1, asyncCall.Result);
         }
     }
 }
diff --git a/src/runtime/intern.cs b/src/runtime/intern.cs
@@ -42,9 +42,10 @@ public static void Initialize()
 
         public static void Shutdown()
         {
-            foreach (var ptr in _intern2strings.Keys)
+            foreach (var entry in _intern2strings)
             {
-                Runtime.XDecref(ptr);
+                Runtime.XDecref(entry.Key);
+                typeof(PyIdentifier).GetField(entry.Value).SetValue(null, IntPtr.Zero);
             }
             _string2interns = null;
             _intern2strings = null;

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`		`-`
`2`	`1`	`using System;`
	`2`	`+using System.Diagnostics;`
`3`	`3`	`using System.Threading;`
`4`	`4`	`using System.Threading.Tasks;`
`5`	`5`
`@@ -30,34 +30,35 @@ public void Dispose()`
`30`	`30`	`[Test]`
`31`	`31`	`public void InterruptTest()`
`32`	`32`	`{`
`33`		`- int runSimpleStringReturnValue = int.MinValue;`
`34`		`- ulong pythonThreadID = ulong.MinValue;`
`35`		`- Task.Factory.StartNew(() =>`
	`33`	`+ long pythonThreadID = 0;`
	`34`	`+ var asyncCall = Task.Factory.StartNew(() =>`
`36`	`35`	`{`
`37`	`36`	`using (Py.GIL())`
`38`	`37`	`{`
`39`		`- pythonThreadID = PythonEngine.GetPythonThreadID();`
`40`		`- runSimpleStringReturnValue = PythonEngine.RunSimpleString(@"`
	`38`	`+ Interlocked.Exchange(ref pythonThreadID, (long)PythonEngine.GetPythonThreadID());`
	`39`	`+ return PythonEngine.RunSimpleString(@"`
`41`	`40`	`import time`
`42`	`41`
`43`	`42`	`while True:`
`44`	`43`	`time.sleep(0.2)");`
`45`	`44`	`}`
`46`	`45`	`});`
`47`	`46`
`48`		`- Thread.Sleep(200);`
`49`		`-`
`50`		`- Assert.AreNotEqual(ulong.MinValue, pythonThreadID);`
	`47`	`+ var timeout = Stopwatch.StartNew();`
	`48`	`+ while (Interlocked.Read(ref pythonThreadID) == 0)`
	`49`	`+ {`
	`50`	`+ Assert.Less(timeout.Elapsed, TimeSpan.FromSeconds(5), "thread ID was not assigned in time");`
	`51`	`+ }`
`51`	`52`
`52`	`53`	`using (Py.GIL())`
`53`	`54`	`{`
`54`		`- int interruptReturnValue = PythonEngine.Interrupt(pythonThreadID);`
	`55`	`+ int interruptReturnValue = PythonEngine.Interrupt((ulong)Interlocked.Read(ref pythonThreadID));`
`55`	`56`	`Assert.AreEqual(1, interruptReturnValue);`
`56`	`57`	`}`
`57`	`58`
`58`		`- Thread.Sleep(300);`
	`59`	`+ Assert.IsTrue(asyncCall.Wait(TimeSpan.FromSeconds(5)), "Async thread was not interrupted in time");`
`59`	`60`
`60`		`- Assert.AreEqual(-1, runSimpleStringReturnValue);`
	`61`	`+ Assert.AreEqual(-1, asyncCall.Result);`
`61`	`62`	`}`
`62`	`63`	`}`
`63`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,9 +42,10 @@ public static void Initialize()`
`42`	`42`
`43`	`43`	`public static void Shutdown()`
`44`	`44`	`{`
`45`		`- foreach (var ptr in _intern2strings.Keys)`
	`45`	`+ foreach (var entry in _intern2strings)`
`46`	`46`	`{`
`47`		`- Runtime.XDecref(ptr);`
	`47`	`+ Runtime.XDecref(entry.Key);`
	`48`	`+ typeof(PyIdentifier).GetField(entry.Value).SetValue(null, IntPtr.Zero);`
`48`	`49`	`}`
`49`	`50`	`_string2interns = null;`
`50`	`51`	`_intern2strings = null;`