Author: Brian Kearns <[email protected]>
Branch:
Changeset: r744:4b28d80ac0bc
Date: 2013-03-20 19:41 -0400
http://bitbucket.org/pypy/buildbot/changeset/4b28d80ac0bc/
Log: allow own32 to run alongside translation: we're more limited by
memory than CPU
diff --git a/bot2/pypybuildbot/builds.py b/bot2/pypybuildbot/builds.py
--- a/bot2/pypybuildbot/builds.py
+++ b/bot2/pypybuildbot/builds.py
@@ -17,8 +17,8 @@
# translations in parallel, but then the actual benchmarks are run in
# sequence.
-# there are 8 logical CPUs, but only 4 physical ones, and only enough memory
for 2 translations
-TannitCPU = locks.MasterLock('tannit_cpu', maxCount=2)
+# there are 8 logical CPUs, but only 4 physical ones, and only enough memory
for ~3 translations
+TannitCPU = locks.MasterLock('tannit_cpu', maxCount=3)
SpeedPythonCPU = locks.MasterLock('speed_python_cpu', maxCount=24)
#WinLockCPU = locks.MasterLock('win_cpu', maxCount=1)
diff --git a/bot2/pypybuildbot/master.py b/bot2/pypybuildbot/master.py
--- a/bot2/pypybuildbot/master.py
+++ b/bot2/pypybuildbot/master.py
@@ -337,16 +337,14 @@
"builddir": LINUX32,
"factory": pypyOwnTestFactory,
"category": 'linux32',
- # this build needs 4 CPUs
- "locks": [TannitCPU.access('exclusive')],
+ "locks": [TannitCPU.access('counting')],
},
{"name": LINUX64,
"slavenames": ["allegro64"],
"builddir": LINUX64,
"factory": pypyOwnTestFactory,
"category": 'linux64',
- # this build needs 4 CPUs
- #"locks": [TannitCPU.access('exclusive')],
+ #"locks": [TannitCPU.access('counting')],
},
{"name": APPLVLLINUX32,
#"slavenames": ["allegro32"],
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
