Commitdaa2901

committed

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

1 parent39b2347 commitdaa2901Copy full SHA for daa2901

File tree

+19

-12

lines changed

+19

-12

lines changed

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`usingSystem;`
	`2`	`+usingSystem.Threading;`
`2`	`3`	`usingNUnit.Framework;`
`3`	`4`	`usingPython.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`	`varresult=ps.Get<int>("res");`

Lines changed: 10 additions & 1 deletion

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`	`publicstaticTypeLookupType(stringqname)`
`456`	`457`	`{`
`457`	`458`	`foreach(Assemblyassemblyinassemblies)`
`@@ -465,6 +466,14 @@ public static Type LookupType(string qname)`
`465`	`466`	`returnnull;`
`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`	`+publicstaticIEnumerable<Type>LookupTypes(stringqualifiedName)`
	`475`	`+=>assemblies.Select(assembly=>assembly.GetType(qualifiedName)).Where(type=>type!=null);`
	`476`	`+`
`468`	`477`	`internalstaticType[]GetTypes(Assemblya)`
`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`	`+}`

Lines changed: 3 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`usingSystem;`
`2`	`2`	`usingSystem.Collections.Generic;`
	`3`	`+usingSystem.Linq;`
`3`	`4`	`usingSystem.IO;`
`4`	`5`	`usingSystem.Reflection;`
`5`	`6`	`usingSystem.Runtime.InteropServices;`
`@@ -105,13 +106,9 @@ public ManagedType GetAttribute(string name, bool guess)`
`105`	`106`	`// Look for a type in the current namespace. Note that this`
`106`	`107`	`// includes types, delegates, enums, interfaces and structs.`
`107`	`108`	`// Only public namespace members are exposed to Python.`
`108`		`-type=AssemblyManager.LookupType(qname);`
	`109`	`+type=AssemblyManager.LookupTypes(qname).FirstOrDefault(t=>t.IsPublic);`
`109`	`110`	`if(type!=null)`
`110`	`111`	`{`
`111`		`-if(!type.IsPublic)`
`112`		`-{`
`113`		`-returnnull;`
`114`		`-}`
`115`	`112`	`c=ClassManager.GetClass(type);`
`116`	`113`	`StoreAttribute(name,c);`
`117`	`114`	`returnc;`
`@@ -131,13 +128,9 @@ public ManagedType GetAttribute(string name, bool guess)`
`131`	`128`	`returnm;`
`132`	`129`	`}`
`133`	`130`
`134`		`-type=AssemblyManager.LookupType(qname);`
	`131`	`+type=AssemblyManager.LookupTypes(qname).FirstOrDefault(t=>t.IsPublic);`
`135`	`132`	`if(type!=null)`
`136`	`133`	`{`
`137`		`-if(!type.IsPublic)`
`138`		`-{`
`139`		`-returnnull;`
`140`		`-}`
`141`	`134`	`c=ClassManager.GetClass(type);`
`142`	`135`	`StoreAttribute(name,c);`
`143`	`136`	`returnc;`

Comments

(0)