Test to test if the test passes

BadSingleton · BadSingleton · commit 286063202e64 · 2021-06-02T10:50:56.000-04:00
diff --git a/src/runtime/BorrowedReference.cs b/src/runtime/BorrowedReference.cs
@@ -9,6 +9,7 @@ readonly ref struct BorrowedReference
     {
         readonly IntPtr pointer;
         public bool IsNull => this.pointer == IntPtr.Zero;
+        public bool IsNone => this.pointer == Runtime.PyNone;
 
         /// <summary>Gets a raw pointer to the Python object</summary>
         public IntPtr DangerousGetAddress()
diff --git a/src/runtime/assemblymanager.cs b/src/runtime/assemblymanager.cs
@@ -39,7 +39,7 @@ internal class AssemblyManager
         internal static List<string> pypath;
         
         // Triggered when a new namespace is added to the namespaces dictionary
-        public static event Action<string> namespaceAdded;
+        // public static event Action<string> namespaceAdded;
 
         private AssemblyManager()
         {
@@ -287,17 +287,17 @@ internal static void ScanAssembly(Assembly assembly)
                 if (ns != null)
                 {
                     namespaces[ns].TryAdd(assembly, string.Empty);
-                    try
-                    {
-                        namespaceAdded?.Invoke(ns);
-                    }
-                    catch (Exception e)
-                    {
-                        // For some reason, exceptions happening here does... nothing.
-                        // Even System.AccessViolationExceptions gets ignored.
-                        Console.WriteLine($"Namespace added callback failed with: {e}");
-                        throw;
-                    }
+                    // try
+                    // {
+                    //     namespaceAdded?.Invoke(ns);
+                    // }
+                    // catch (Exception e)
+                    // {
+                    //     // For some reason, exceptions happening here does... nothing.
+                    //     // Even System.AccessViolationExceptions gets ignored.
+                    //     Console.WriteLine($"Namespace added callback failed with: {e}");
+                    //     throw;
+                    // }
                 }
 
                 if (ns != null && t.IsGenericTypeDefinition)
diff --git a/src/runtime/importhook.cs b/src/runtime/importhook.cs
@@ -147,7 +147,7 @@ static void SetupImportHook()
         /// </summary>
         static void SetupNamespaceTracking()
         {
-            var newset = Runtime.PySet_New(new BorrowedReference(IntPtr.Zero));
+            var newset = Runtime.PySet_New(default);
             try
             {
                 foreach (var ns in AssemblyManager.GetNamespaces())
@@ -176,8 +176,8 @@ static void SetupNamespaceTracking()
                 newset.Dispose();
             }
 
-            AssemblyManager.namespaceAdded += OnNamespaceAdded;
-            PythonEngine.AddShutdownHandler(() => AssemblyManager.namespaceAdded -= OnNamespaceAdded);
+            // AssemblyManager.namespaceAdded += OnNamespaceAdded;
+            // PythonEngine.AddShutdownHandler(() => AssemblyManager.namespaceAdded -= OnNamespaceAdded);
         }
 
         /// <summary>
@@ -186,20 +186,25 @@ static void SetupNamespaceTracking()
         /// </summary>
         static void TeardownNameSpaceTracking()
         {
-            AssemblyManager.namespaceAdded -= OnNamespaceAdded;
+            // AssemblyManager.namespaceAdded -= OnNamespaceAdded;
             // If the C# runtime isn't loaded, then there are no namespaces available
             Runtime.PyDict_SetItemString(root.dict, availableNsKey, Runtime.PyNone);
         }
 
-        static void OnNamespaceAdded(string name)
+        public static void OnNamespaceAdded(string name)
         {
+            Console.WriteLine(System.Environment.StackTrace);
+            Console.WriteLine("OnNamespaceAdded: acquiring");
+            Console.Out.Flush();
             using (Py.GIL())
             {
+                Console.WriteLine("OnNamespaceAdded: acquired");
+                Console.Out.Flush();
                 var pyNs = Runtime.PyString_FromString(name);
                 try
                 {
                     var nsSet = Runtime.PyDict_GetItemString(new BorrowedReference(root.dict), availableNsKey);
-                    if (!nsSet.IsNull || nsSet.DangerousGetAddress() != Runtime.PyNone)
+                    if (!(nsSet.IsNull && nsSet.IsNone))
                     {
                         if (Runtime.PySet_Add(nsSet, new BorrowedReference(pyNs)) != 0)
                         {
@@ -212,6 +217,8 @@ static void OnNamespaceAdded(string name)
                     Runtime.XDecref(pyNs);
                 }
             }
+            Console.WriteLine("OnNamespaceAdded: released");
+            Console.Out.Flush();
         }
 
 
diff --git a/src/runtime/moduleobject.cs b/src/runtime/moduleobject.cs
@@ -529,6 +529,11 @@ public static Assembly AddReference(string name)
             }
             // Classes that are not in a namespace needs an extra nudge to be found.
             ImportHook.UpdateCLRModuleDict();
+
+            // Heavyhanded but otherwise we'd need a "addedSinceLastCall".
+            foreach(var ns in AssemblyManager.GetNamespaces()){
+                ImportHook.OnNamespaceAdded(ns);
+            }
             return assembly;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ readonly ref struct BorrowedReference`
`9`	`9`	`{`
`10`	`10`	`readonly IntPtr pointer;`
`11`	`11`	`public bool IsNull => this.pointer == IntPtr.Zero;`
	`12`	`+ public bool IsNone => this.pointer == Runtime.PyNone;`
`12`	`13`
`13`	`14`	`/// <summary>Gets a raw pointer to the Python object</summary>`
`14`	`15`	`public IntPtr DangerousGetAddress()`
Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ static void SetupImportHook()`
`147`	`147`	`/// </summary>`
`148`	`148`	`static void SetupNamespaceTracking()`
`149`	`149`	`{`
`150`		`- var newset = Runtime.PySet_New(new BorrowedReference(IntPtr.Zero));`
	`150`	`+ var newset = Runtime.PySet_New(default);`
`151`	`151`	`try`
`152`	`152`	`{`
`153`	`153`	`foreach (var ns in AssemblyManager.GetNamespaces())`
`@@ -176,8 +176,8 @@ static void SetupNamespaceTracking()`
`176`	`176`	`newset.Dispose();`
`177`	`177`	`}`
`178`	`178`
`179`		`- AssemblyManager.namespaceAdded += OnNamespaceAdded;`
`180`		`- PythonEngine.AddShutdownHandler(() => AssemblyManager.namespaceAdded -= OnNamespaceAdded);`
	`179`	`+ // AssemblyManager.namespaceAdded += OnNamespaceAdded;`
	`180`	`+ // PythonEngine.AddShutdownHandler(() => AssemblyManager.namespaceAdded -= OnNamespaceAdded);`
`181`	`181`	`}`
`182`	`182`
`183`	`183`	`/// <summary>`
`@@ -186,20 +186,25 @@ static void SetupNamespaceTracking()`
`186`	`186`	`/// </summary>`
`187`	`187`	`static void TeardownNameSpaceTracking()`
`188`	`188`	`{`
`189`		`- AssemblyManager.namespaceAdded -= OnNamespaceAdded;`
	`189`	`+ // AssemblyManager.namespaceAdded -= OnNamespaceAdded;`
`190`	`190`	`// If the C# runtime isn't loaded, then there are no namespaces available`
`191`	`191`	`Runtime.PyDict_SetItemString(root.dict, availableNsKey, Runtime.PyNone);`
`192`	`192`	`}`
`193`	`193`
`194`		`- static void OnNamespaceAdded(string name)`
	`194`	`+ public static void OnNamespaceAdded(string name)`
`195`	`195`	`{`
	`196`	`+ Console.WriteLine(System.Environment.StackTrace);`
	`197`	`+ Console.WriteLine("OnNamespaceAdded: acquiring");`
	`198`	`+ Console.Out.Flush();`
`196`	`199`	`using (Py.GIL())`
`197`	`200`	`{`
	`201`	`+ Console.WriteLine("OnNamespaceAdded: acquired");`
	`202`	`+ Console.Out.Flush();`
`198`	`203`	`var pyNs = Runtime.PyString_FromString(name);`
`199`	`204`	`try`
`200`	`205`	`{`
`201`	`206`	`var nsSet = Runtime.PyDict_GetItemString(new BorrowedReference(root.dict), availableNsKey);`
`202`		`- if (!nsSet.IsNull \|\| nsSet.DangerousGetAddress() != Runtime.PyNone)`
	`207`	`+ if (!(nsSet.IsNull && nsSet.IsNone))`
`203`	`208`	`{`
`204`	`209`	`if (Runtime.PySet_Add(nsSet, new BorrowedReference(pyNs)) != 0)`
`205`	`210`	`{`
`@@ -212,6 +217,8 @@ static void OnNamespaceAdded(string name)`
`212`	`217`	`Runtime.XDecref(pyNs);`
`213`	`218`	`}`
`214`	`219`	`}`
	`220`	`+ Console.WriteLine("OnNamespaceAdded: released");`
	`221`	`+ Console.Out.Flush();`
`215`	`222`	`}`
`216`	`223`
`217`	`224`
Original file line number	Diff line number	Diff line change
`@@ -529,6 +529,11 @@ public static Assembly AddReference(string name)`
`529`	`529`	`}`
`530`	`530`	`// Classes that are not in a namespace needs an extra nudge to be found.`
`531`	`531`	`ImportHook.UpdateCLRModuleDict();`
	`532`	`+`
	`533`	`+ // Heavyhanded but otherwise we'd need a "addedSinceLastCall".`
	`534`	`+ foreach(var ns in AssemblyManager.GetNamespaces()){`
	`535`	`+ ImportHook.OnNamespaceAdded(ns);`
	`536`	`+ }`
`532`	`537`	`return assembly;`
`533`	`538`	`}`
`534`	`539`