attempt to fix PyScopeTest.TestThread() reading stale value from res in Python 2.7 x64

lostmsu · lostmsu · commit daa2901b1323 · 2020-01-31T22:43:45.000-08:00
diff --git a/src/embed_tests/TestPyScope.cs b/src/embed_tests/TestPyScope.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Threading;
 using NUnit.Framework;
 using Python.Runtime;
 
@@ -337,9 +338,12 @@ public void TestThread()
                     //add function to the scope 
                     //can be call many times, more efficient than ast 
                     ps.Exec(
+                        "import clr\n" +
+                        "from System.Threading import Thread\n" +
                         "def update():\n" +
                         "    global res, th_cnt\n" +
                         "    res += bb + 1\n" +
+                        "    Thread.MemoryBarrier()\n" +
                         "    th_cnt += 1\n"
                     );
                 }
@@ -364,8 +368,9 @@ public void TestThread()
                     {
                         cnt = ps.Get<int>("th_cnt");
                     }
-                    System.Threading.Thread.Sleep(10);
+                    Thread.Sleep(10);
                 }
+                Thread.MemoryBarrier();
                 using (Py.GIL())
                 {
                     var result = ps.Get<int>("res");
diff --git a/src/runtime/assemblymanager.cs b/src/runtime/assemblymanager.cs
@@ -452,6 +452,7 @@ public static List<string> GetNames(string nsname)
         /// looking in the currently loaded assemblies for the named
         /// type. Returns null if the named type cannot be found.
         /// </summary>
+        [Obsolete("Use LookupTypes and handle name conflicts")]
         public static Type LookupType(string qname)
         {
             foreach (Assembly assembly in assemblies)
@@ -465,6 +466,14 @@ public static Type LookupType(string qname)
             return null;
         }
 
+        /// <summary>
+        /// Returns the <see cref="Type"/> objects for the given qualified name,
+        /// looking in the currently loaded assemblies for the named
+        /// type.
+        /// </summary>
+        public static IEnumerable<Type> LookupTypes(string qualifiedName)
+            => assemblies.Select(assembly => assembly.GetType(qualifiedName)).Where(type => type != null);
+
         internal static Type[] GetTypes(Assembly a)
         {
             if (a.IsDynamic)
@@ -492,4 +501,4 @@ internal static Type[] GetTypes(Assembly a)
             }
         }
     }
-}
+}
diff --git a/src/runtime/moduleobject.cs b/src/runtime/moduleobject.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.IO;
 using System.Reflection;
 using System.Runtime.InteropServices;
@@ -105,13 +106,9 @@ public ManagedType GetAttribute(string name, bool guess)
             // Look for a type in the current namespace. Note that this
             // includes types, delegates, enums, interfaces and structs.
             // Only public namespace members are exposed to Python.
-            type = AssemblyManager.LookupType(qname);
+            type = AssemblyManager.LookupTypes(qname).FirstOrDefault(t => t.IsPublic);
             if (type != null)
             {
-                if (!type.IsPublic)
-                {
-                    return null;
-                }
                 c = ClassManager.GetClass(type);
                 StoreAttribute(name, c);
                 return c;
@@ -131,13 +128,9 @@ public ManagedType GetAttribute(string name, bool guess)
                     return m;
                 }
 
-                type = AssemblyManager.LookupType(qname);
+                type = AssemblyManager.LookupTypes(qname).FirstOrDefault(t => t.IsPublic);
                 if (type != null)
                 {
-                    if (!type.IsPublic)
-                    {
-                        return null;
-                    }
                     c = ClassManager.GetClass(type);
                     StoreAttribute(name, c);
                     return c;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using System;`
	`2`	`+using System.Threading;`
`2`	`3`	`using NUnit.Framework;`
`3`	`4`	`using Python.Runtime;`
`4`	`5`
`@@ -337,9 +338,12 @@ public void TestThread()`
`337`	`338`	`//add function to the scope`
`338`	`339`	`//can be call many times, more efficient than ast`
`339`	`340`	`ps.Exec(`
	`341`	`+ "import clr\n" +`
	`342`	`+ "from System.Threading import Thread\n" +`
`340`	`343`	`"def update():\n" +`
`341`	`344`	`" global res, th_cnt\n" +`
`342`	`345`	`" res += bb + 1\n" +`
	`346`	`+ " Thread.MemoryBarrier()\n" +`
`343`	`347`	`" th_cnt += 1\n"`
`344`	`348`	`);`
`345`	`349`	`}`
`@@ -364,8 +368,9 @@ public void TestThread()`
`364`	`368`	`{`
`365`	`369`	`cnt = ps.Get<int>("th_cnt");`
`366`	`370`	`}`
`367`		`- System.Threading.Thread.Sleep(10);`
	`371`	`+ Thread.Sleep(10);`
`368`	`372`	`}`
	`373`	`+ Thread.MemoryBarrier();`
`369`	`374`	`using (Py.GIL())`
`370`	`375`	`{`
`371`	`376`	`var result = ps.Get<int>("res");`
Original file line number	Diff line number	Diff line change
`@@ -452,6 +452,7 @@ public static List<string> GetNames(string nsname)`
`452`	`452`	`/// looking in the currently loaded assemblies for the named`
`453`	`453`	`/// type. Returns null if the named type cannot be found.`
`454`	`454`	`/// </summary>`
	`455`	`+ [Obsolete("Use LookupTypes and handle name conflicts")]`
`455`	`456`	`public static Type LookupType(string qname)`
`456`	`457`	`{`
`457`	`458`	`foreach (Assembly assembly in assemblies)`
`@@ -465,6 +466,14 @@ public static Type LookupType(string qname)`
`465`	`466`	`return null;`
`466`	`467`	`}`
`467`	`468`
	`469`	`+ /// <summary>`
	`470`	`+ /// Returns the <see cref="Type"/> objects for the given qualified name,`
	`471`	`+ /// looking in the currently loaded assemblies for the named`
	`472`	`+ /// type.`
	`473`	`+ /// </summary>`
	`474`	`+ public static IEnumerable<Type> LookupTypes(string qualifiedName)`
	`475`	`+ => assemblies.Select(assembly => assembly.GetType(qualifiedName)).Where(type => type != null);`
	`476`	`+`
`468`	`477`	`internal static Type[] GetTypes(Assembly a)`
`469`	`478`	`{`
`470`	`479`	`if (a.IsDynamic)`
`@@ -492,4 +501,4 @@ internal static Type[] GetTypes(Assembly a)`
`492`	`501`	`}`
`493`	`502`	`}`
`494`	`503`	`}`
`495`		`-}`
	`504`	`+}`