Reflect PR #34

C-SELLERS · C-SELLERS · commit 481f4d0ef27a · 2021-02-15T13:14:15.000-08:00
diff --git a/src/runtime/pythonengine.cs b/src/runtime/pythonengine.cs
@@ -182,6 +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();
+            Console.WriteLine("PythonEngine.Initialize(): Runtime.Initialize()...");
             Runtime.Initialize(initSigs, mode);
             initialized = true;
             Exceptions.Clear();
@@ -199,6 +200,7 @@ public static void Initialize(IEnumerable<string> args, bool setSysArgv = true,
             }
 
             // Load the clr.py resource into the clr module
+            Console.WriteLine("PythonEngine.Initialize(): GetCLRModule()...");
             NewReference clr = Python.Runtime.ImportHook.GetCLRModule();
             BorrowedReference clr_dict = Runtime.PyModule_GetDict(clr);
 
@@ -210,6 +212,7 @@ public static void Initialize(IEnumerable<string> args, bool setSysArgv = true,
                 BorrowedReference builtins = Runtime.PyEval_GetBuiltins();
                 Runtime.PyDict_SetItemString(module_globals, "__builtins__", builtins);
 
+                Console.WriteLine("PythonEngine.Initialize(): clr GetManifestResourceStream...");
                 Assembly assembly = Assembly.GetExecutingAssembly();
                 using (Stream stream = assembly.GetManifestResourceStream("clr.py"))
                 using (var reader = new StreamReader(stream))
diff --git a/src/runtime/runtime.cs b/src/runtime/runtime.cs
@@ -116,9 +116,11 @@ internal static void Initialize(bool initSigs = false, ShutdownMode mode = Shutd
 
             if (Py_IsInitialized() == 0)
             {
+                Console.WriteLine("Runtime.Initialize(): Py_Initialize...");
                 Py_InitializeEx(initSigs ? 1 : 0);
                 if (PyEval_ThreadsInitialized() == 0)
                 {
+                    Console.WriteLine("Runtime.Initialize(): PyEval_InitThreads...");
                     PyEval_InitThreads();
                 }
                 // XXX: Reload mode may reduct to Soft mode,
@@ -143,7 +145,9 @@ internal static void Initialize(bool initSigs = false, ShutdownMode mode = Shutd
             IsFinalizing = false;
             InternString.Initialize();
 
+            Console.WriteLine("Runtime.Initialize(): Initialize types...");
             InitPyMembers();
+            Console.WriteLine("Runtime.Initialize(): Initialize types end.");
 
             ABI.Initialize(PyVersion,
                            pyType: new BorrowedReference(PyTypeType));
@@ -155,6 +159,7 @@ internal static void Initialize(bool initSigs = false, ShutdownMode mode = Shutd
             TypeManager.Initialize();
 
             // Initialize modules that depend on the runtime class.
+            Console.WriteLine("Runtime.Initialize(): AssemblyManager.Initialize()...");
             AssemblyManager.Initialize();
             OperatorMethod.Initialize();
             if (mode == ShutdownMode.Reload && RuntimeData.HasStashData())
@@ -178,6 +183,7 @@ internal static void Initialize(bool initSigs = false, ShutdownMode mode = Shutd
                 PyList_Append(new BorrowedReference(path), item);
             }
             XDecref(item);
+            Console.WriteLine("Runtime.Initialize(): AssemblyManager.UpdatePath()...");
             AssemblyManager.UpdatePath();
         }
 
