Fix synchronization in PyScopeTest.TestThread as suggested in da97502 (pythonnet#1070)

lostmsu · web-flow · commit 925c1660d738 · 2020-03-06T07:45:42.000+01:00
Fixes pythonnet#1067.
diff --git a/src/embed_tests/TestPyScope.cs b/src/embed_tests/TestPyScope.cs
@@ -338,16 +338,16 @@ 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" +
+                        "import threading\n" +
+                        "lock = threading.Lock()\n" +
                         "def update():\n" +
-                        "    global res, th_cnt\n" +
+                        "  global res, th_cnt\n" +
+                        "  with lock:\n" +
                         "    res += bb + 1\n" +
-                        "    Thread.MemoryBarrier()\n" +
                         "    th_cnt += 1\n"
                     );
                 }
-                int th_cnt = 3;
+                int th_cnt = 100;
                 for (int i = 0; i < th_cnt; i++)
                 {
                     System.Threading.Thread th = new System.Threading.Thread(() =>
@@ -368,9 +368,8 @@ public void TestThread()
                     {
                         cnt = ps.Get<int>("th_cnt");
                     }
-                    Thread.Sleep(10);
+                    Thread.Yield();
                 }
-                Thread.MemoryBarrier();
                 using (Py.GIL())
                 {
                     var result = ps.Get<int>("res");

Original file line number	Diff line number	Diff line change
`@@ -338,16 +338,16 @@ public void TestThread()`
`338`	`338`	`//add function to the scope`
`339`	`339`	`//can be call many times, more efficient than ast`
`340`	`340`	`ps.Exec(`
`341`		`- "import clr\n" +`
`342`		`- "from System.Threading import Thread\n" +`
	`341`	`+ "import threading\n" +`
	`342`	`+ "lock = threading.Lock()\n" +`
`343`	`343`	`"def update():\n" +`
`344`		`- " global res, th_cnt\n" +`
	`344`	`+ " global res, th_cnt\n" +`
	`345`	`+ " with lock:\n" +`
`345`	`346`	`" res += bb + 1\n" +`
`346`		`- " Thread.MemoryBarrier()\n" +`
`347`	`347`	`" th_cnt += 1\n"`
`348`	`348`	`);`
`349`	`349`	`}`
`350`		`- int th_cnt = 3;`
	`350`	`+ int th_cnt = 100;`
`351`	`351`	`for (int i = 0; i < th_cnt; i++)`
`352`	`352`	`{`
`353`	`353`	`System.Threading.Thread th = new System.Threading.Thread(() =>`
`@@ -368,9 +368,8 @@ public void TestThread()`
`368`	`368`	`{`
`369`	`369`	`cnt = ps.Get<int>("th_cnt");`
`370`	`370`	`}`
`371`		`- Thread.Sleep(10);`
	`371`	`+ Thread.Yield();`
`372`	`372`	`}`
`373`		`- Thread.MemoryBarrier();`
`374`	`373`	`using (Py.GIL())`
`375`	`374`	`{`
`376`	`375`	`var result = ps.Get<int>("res");`