merge 3.4-slp (Stackless python#103)

Author: Anselm Kruis

Stackless/changelog.txt

@@ -9,6 +9,9 @@ What's New in Stackless 3.X.X?
 
 *Release date: 20XX-XX-XX*
 
+- https://bitbucket.org/stackless-dev/stackless/issues/103
+  Fix an invalid assertion during interpreter shutdown.
+
 - https://bitbucket.org/stackless-dev/stackless/issues/101
   Enhance Tools/gdb/libpython.py to support debugging Stackless Python.
   You can now debug Stackless Python with gdb. Unfortunately gdb still

Stackless/core/stacklesseval.c

@@ -550,7 +550,10 @@ void slp_kill_tasks_with_stacks(PyThreadState *target_ts)
             if (t == NULL)
                 continue;
             Py_INCREF(t);  /* cs->task is a borrowed ref */
-            assert(t->cstate == cs);
+            if (t->cstate != cs) {
+                Py_DECREF(t);
+                continue;  /* not the current cstate of the tasklet */
+            }
             if (cs->tstate == cts) {
                 Py_DECREF(t);
                 continue;  /* already handled */

Stackless/unittests/test_defects.py

@@ -414,6 +414,38 @@ def other_thread_main():
         t.join()
         print("Done")
 
+    @unittest.skipUnless(withThreads, "requires thread support")
+    def test_deep_thread(self):
+        # test for issue #103 https://bitbucket.org/stackless-dev/stackless/issues/103/
+        import subprocess
+        rc = subprocess.call([sys.executable, "-S", "-E", "-c", """from __future__ import print_function, absolute_import\nif 1:
+            import threading
+            import stackless
+            import time
+            import sys
+            from stackless import _test_nostacklesscall as apply
+
+            RECURSION_DEPTH = 200
+
+            event = threading.Event()
+
+            def recurse():
+                if stackless.current.nesting_level < RECURSION_DEPTH:
+                    apply(recurse)
+                else:
+                    event.set()
+                    time.sleep(10)
+
+            t = threading.Thread(target=recurse, name="other_thread")
+            t.daemon = True
+            t.start()
+            event.wait(10)
+            # print("end")
+            sys.stdout.flush()
+            sys.exit(42)
+            """])
+        self.assertEqual(rc, 42)
+
 
 class TestStacklessProtokoll(StacklessTestCase):
     """Various tests for violations of the STACKLESS_GETARG() STACKLESS_ASSERT() protocol