Author: Armin Rigo <[email protected]>
Branch: stacklet
Changeset: r46316:7ce3b3a09870
Date: 2011-08-06 12:32 +0200
http://bitbucket.org/pypy/pypy/changeset/7ce3b3a09870/
Log: Add this test from rlib/test/test_rstacklet. It fails, showing an
issue with saving/restoring the executioncontext's state.
diff --git a/pypy/module/_stacklet/interp_stacklet.py
b/pypy/module/_stacklet/interp_stacklet.py
--- a/pypy/module/_stacklet/interp_stacklet.py
+++ b/pypy/module/_stacklet/interp_stacklet.py
@@ -48,7 +48,7 @@
elif rstacklet.is_empty_handle(h):
return self.space.w_None
else:
- return W_Stacklet(self, h)
+ return self.space.wrap(W_Stacklet(self, h))
ExecutionContext.stacklet_thread = None
diff --git a/pypy/module/_stacklet/test/test_stacklet.py
b/pypy/module/_stacklet/test/test_stacklet.py
--- a/pypy/module/_stacklet/test/test_stacklet.py
+++ b/pypy/module/_stacklet/test/test_stacklet.py
@@ -1,9 +1,13 @@
+import os
from pypy.conftest import gettestobjspace
class AppTestStacklet:
def setup_class(cls):
cls.space = gettestobjspace(usemodules=['_stacklet'])
+ cls.w_translated = cls.space.wrap(
+ os.path.join(os.path.dirname(__file__),
+ 'test_translated.py'))
def test_new_empty(self):
from _stacklet import newstacklet
@@ -93,3 +97,9 @@
h2 = h.switch()
assert h2 is None
assert seen == [1, 2, 3]
+
+ def test_various_depths(self):
+ # run it from test_translated, but not while being actually translated
+ d = {}
+ execfile(self.translated, d)
+ d['test_various_depths'](max=100)
diff --git a/pypy/module/_stacklet/test/test_translated.py
b/pypy/module/_stacklet/test/test_translated.py
new file mode 100644
--- /dev/null
+++ b/pypy/module/_stacklet/test/test_translated.py
@@ -0,0 +1,110 @@
+try:
+ import _stacklet
+except ImportError:
+ import py; py.test.skip("to run on top of a translated pypy-c")
+
+import random
+
+# ____________________________________________________________
+
+class Task:
+ def __init__(self, n):
+ self.n = n
+ self.h = None
+
+ def withdepth(self, d):
+ if d > 0:
+ res = self.withdepth(d-1)
+ else:
+ res = 0
+ n = random.randrange(10)
+ if n == self.n or (Task.status >= Task.max and
+ not Task.tasks[n].h):
+ return 1
+
+ print "status == %d, self.n = %d" % (Task.status, self.n)
+ assert not self.h
+ assert Task.nextstep == -1
+ Task.status += 1
+ Task.nextstep = Task.status
+ Task.comefrom = self.n
+ Task.gointo = n
+ task = Task.tasks[n]
+ if not task.h:
+ # start a new stacklet
+ print "NEW", n
+ h = _stacklet.newstacklet(variousstackdepths_callback, n)
+ else:
+ # switch to this stacklet
+ print "switch to", n
+ h = task.h
+ task.h = None
+ h = h.switch()
+
+ print "back in self.n = %d, coming from %d" % (self.n,
+ Task.comefrom)
+ assert Task.nextstep == Task.status
+ Task.nextstep = -1
+ assert Task.gointo == self.n
+ assert Task.comefrom != self.n
+ assert self.h is None
+ if Task.comefrom != -42:
+ assert 0 <= Task.comefrom < 10
+ task = Task.tasks[Task.comefrom]
+ assert task.h is None
+ task.h = h
+ else:
+ assert h is None
+ Task.comefrom = -1
+ Task.gointo = -1
+ assert (res & (res-1)) == 0
+ return res
+
+def variousstackdepths_callback(h, arg):
+ assert Task.nextstep == Task.status
+ Task.nextstep = -1
+ assert arg == Task.gointo
+ self = Task.tasks[arg]
+ assert self.n == Task.gointo
+ assert self.h is None
+ assert 0 <= Task.comefrom < 10
+ task = Task.tasks[Task.comefrom]
+ assert task.h is None
+ assert type(h) is _stacklet.Stacklet
+ task.h = h
+ Task.comefrom = -1
+ Task.gointo = -1
+
+ while self.withdepth(random.randrange(20)) == 0:
+ pass
+
+ assert self.h is None
+ while 1:
+ n = random.randrange(10)
+ h = Task.tasks[n].h
+ if h is not None:
+ break
+
+ Task.tasks[n].h = None
+ Task.comefrom = -42
+ Task.gointo = n
+ assert Task.nextstep == -1
+ Task.status += 1
+ Task.nextstep = Task.status
+ print "LEAVING %d to go to %d" % (self.n, n)
+ return h
+
+
+def test_various_depths(max=50000):
+ Task.tasks = [Task(i) for i in range(10)]
+ Task.nextstep = -1
+ Task.comefrom = -1
+ Task.status = 0
+ Task.max = max
+ while Task.status < max or any_alive():
+ Task.tasks[0].withdepth(random.randrange(0, 50))
+
+# ____________________________________________________________
+
+if __name__ == '__main__':
+ test_various_depths()
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
