Disambiguate Initialization

BadSingleton · BadSingleton · commit 598cb771d345 · 2020-09-03T11:47:04.000-04:00
between initializing from CPython and initializing after a domain reload
Add an optional argument to signal to the initialization that it's
coming from CPython
diff --git a/src/runtime/pythonengine.cs b/src/runtime/pythonengine.cs
@@ -155,9 +155,9 @@ public static void Initialize()
             Initialize(setSysArgv: true);
         }
 
-        public static void Initialize(bool setSysArgv = true, bool initSigs = false, ShutdownMode mode = ShutdownMode.Default)
+        public static void Initialize(bool setSysArgv = true, bool initSigs = false, ShutdownMode mode = ShutdownMode.Default, bool fromPython = false)
         {
-            Initialize(Enumerable.Empty<string>(), setSysArgv: setSysArgv, initSigs: initSigs, mode);
+            Initialize(Enumerable.Empty<string>(), setSysArgv: setSysArgv, initSigs: initSigs, mode, fromPython: fromPython);
         }
 
         /// <summary>
@@ -170,7 +170,7 @@ public static void Initialize(bool setSysArgv = true, bool initSigs = false, Shu
         /// interpreter lock (GIL) to call this method.
         /// initSigs can be set to 1 to do default python signal configuration. This will override the way signals are handled by the application.
         /// </remarks>
-        public static void Initialize(IEnumerable<string> args, bool setSysArgv = true, bool initSigs = false, ShutdownMode mode = ShutdownMode.Default)
+        public static void Initialize(IEnumerable<string> args, bool setSysArgv = true, bool initSigs = false, ShutdownMode mode = ShutdownMode.Default, bool fromPython = false)
         {
             if (initialized)
             {
@@ -182,7 +182,7 @@ public static void Initialize(IEnumerable<string> args, bool setSysArgv = true,
             // during an initial "import clr", and the world ends shortly thereafter.
             // This is probably masking some bad mojo happening somewhere in Runtime.Initialize().
             delegateManager = new DelegateManager();
-            Runtime.Initialize(initSigs, mode);
+            Runtime.Initialize(initSigs, mode, fromPython);
             initialized = true;
             Exceptions.Clear();
 
@@ -265,7 +265,7 @@ public static IntPtr InitExt()
         {
             try
             {
-                Initialize(setSysArgv: false);
+                Initialize(setSysArgv: false, fromPython: true);
 
                 // Trickery - when the import hook is installed into an already
                 // running Python, the standard import machinery is still in
diff --git a/src/runtime/runtime.cs b/src/runtime/runtime.cs
@@ -129,7 +129,7 @@ internal static Version PyVersion
         /// </summary>
         /// <remarks>When calling this method after a soft shutdown or a domain reload,
         ///  this method acquires and releases the GIL. </remarks>
-        internal static void Initialize(bool initSigs = false, ShutdownMode mode = ShutdownMode.Default)
+        internal static void Initialize(bool initSigs = false, ShutdownMode mode = ShutdownMode.Default, bool fromPython = false)
         {
             if (_isInitialized)
             {
@@ -163,16 +163,15 @@ internal static void Initialize(bool initSigs = false, ShutdownMode mode = Shutd
                     RuntimeState.Save();
                 }
 #endif
-                MainManagedThreadId = Thread.CurrentThread.ManagedThreadId;
             }
-            else
+            else if (!fromPython)
             {
                 // If we're coming back from a domain reload or a soft shutdown,
                 // we have previously released the thread state. Restore the main
                 // thread state here.
                 PyEval_RestoreThread(PyGILState_GetThisThreadState());
-                MainManagedThreadId = Thread.CurrentThread.ManagedThreadId;
             }
+            MainManagedThreadId = Thread.CurrentThread.ManagedThreadId;
 
             IsFinalizing = false;
 

Original file line number	Diff line number	Diff line change
`@@ -155,9 +155,9 @@ public static void Initialize()`
`155`	`155`	`Initialize(setSysArgv: true);`
`156`	`156`	`}`
`157`	`157`
`158`		`- public static void Initialize(bool setSysArgv = true, bool initSigs = false, ShutdownMode mode = ShutdownMode.Default)`
	`158`	`+ public static void Initialize(bool setSysArgv = true, bool initSigs = false, ShutdownMode mode = ShutdownMode.Default, bool fromPython = false)`
`159`	`159`	`{`
`160`		`- Initialize(Enumerable.Empty<string>(), setSysArgv: setSysArgv, initSigs: initSigs, mode);`
	`160`	`+ Initialize(Enumerable.Empty<string>(), setSysArgv: setSysArgv, initSigs: initSigs, mode, fromPython: fromPython);`
`161`	`161`	`}`
`162`	`162`
`163`	`163`	`/// <summary>`
`@@ -170,7 +170,7 @@ public static void Initialize(bool setSysArgv = true, bool initSigs = false, Shu`
`170`	`170`	`/// interpreter lock (GIL) to call this method.`
`171`	`171`	`/// initSigs can be set to 1 to do default python signal configuration. This will override the way signals are handled by the application.`
`172`	`172`	`/// </remarks>`
`173`		`- public static void Initialize(IEnumerable<string> args, bool setSysArgv = true, bool initSigs = false, ShutdownMode mode = ShutdownMode.Default)`
	`173`	`+ public static void Initialize(IEnumerable<string> args, bool setSysArgv = true, bool initSigs = false, ShutdownMode mode = ShutdownMode.Default, bool fromPython = false)`
`174`	`174`	`{`
`175`	`175`	`if (initialized)`
`176`	`176`	`{`
`@@ -182,7 +182,7 @@ public static void Initialize(IEnumerable<string> args, bool setSysArgv = true,`
`182`	`182`	`// during an initial "import clr", and the world ends shortly thereafter.`
`183`	`183`	`// This is probably masking some bad mojo happening somewhere in Runtime.Initialize().`
`184`	`184`	`delegateManager = new DelegateManager();`
`185`		`- Runtime.Initialize(initSigs, mode);`
	`185`	`+ Runtime.Initialize(initSigs, mode, fromPython);`
`186`	`186`	`initialized = true;`
`187`	`187`	`Exceptions.Clear();`
`188`	`188`
`@@ -265,7 +265,7 @@ public static IntPtr InitExt()`
`265`	`265`	`{`
`266`	`266`	`try`
`267`	`267`	`{`
`268`		`- Initialize(setSysArgv: false);`
	`268`	`+ Initialize(setSysArgv: false, fromPython: true);`
`269`	`269`
`270`	`270`	`// Trickery - when the import hook is installed into an already`
`271`	`271`	`// running Python, the standard import machinery is still in`
Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ internal static Version PyVersion`
`129`	`129`	`/// </summary>`
`130`	`130`	`/// <remarks>When calling this method after a soft shutdown or a domain reload,`
`131`	`131`	`/// this method acquires and releases the GIL. </remarks>`
`132`		`- internal static void Initialize(bool initSigs = false, ShutdownMode mode = ShutdownMode.Default)`
	`132`	`+ internal static void Initialize(bool initSigs = false, ShutdownMode mode = ShutdownMode.Default, bool fromPython = false)`
`133`	`133`	`{`
`134`	`134`	`if (_isInitialized)`
`135`	`135`	`{`
`@@ -163,16 +163,15 @@ internal static void Initialize(bool initSigs = false, ShutdownMode mode = Shutd`
`163`	`163`	`RuntimeState.Save();`
`164`	`164`	`}`
`165`	`165`	`#endif`
`166`		`- MainManagedThreadId = Thread.CurrentThread.ManagedThreadId;`
`167`	`166`	`}`
`168`		`- else`
	`167`	`+ else if (!fromPython)`
`169`	`168`	`{`
`170`	`169`	`// If we're coming back from a domain reload or a soft shutdown,`
`171`	`170`	`// we have previously released the thread state. Restore the main`
`172`	`171`	`// thread state here.`
`173`	`172`	`PyEval_RestoreThread(PyGILState_GetThisThreadState());`
`174`		`- MainManagedThreadId = Thread.CurrentThread.ManagedThreadId;`
`175`	`173`	`}`
	`174`	`+ MainManagedThreadId = Thread.CurrentThread.ManagedThreadId;`
`176`	`175`
`177`	`176`	`IsFinalizing = false;`
`178`	`177`