[pypy-commit] pypy stmgc-c7: Add another stmdict to reduce conflicts

2015-03-21 Thread arigo
Author: Armin Rigo ar...@tunes.org Branch: stmgc-c7 Changeset: r76487:3956536622d3 Date: 2015-03-21 10:33 +0100 http://bitbucket.org/pypy/pypy/changeset/3956536622d3/ Log:Add another stmdict to reduce conflicts diff --git a/rpython/annotator/bookkeeper.py b/rpython/annotator/bookkeeper.py

[pypy-commit] pypy default: Test and fix for EmptyProfiler

2015-03-21 Thread arigo
Author: Armin Rigo ar...@tunes.org Branch: Changeset: r76485:8438bb05ecf2 Date: 2015-03-21 09:21 +0100 http://bitbucket.org/pypy/pypy/changeset/8438bb05ecf2/ Log:Test and fix for EmptyProfiler diff --git a/rpython/jit/metainterp/jitprof.py b/rpython/jit/metainterp/jitprof.py ---

[pypy-commit] pypy stmgc-c7: Test and fix for EmptyProfiler

2015-03-21 Thread arigo
Author: Armin Rigo ar...@tunes.org Branch: stmgc-c7 Changeset: r76486:fd630b2807a8 Date: 2015-03-21 09:21 +0100 http://bitbucket.org/pypy/pypy/changeset/fd630b2807a8/ Log:Test and fix for EmptyProfiler diff --git a/rpython/jit/metainterp/jitprof.py b/rpython/jit/metainterp/jitprof.py ---

[pypy-commit] pypy stmgc-c7: Disable the jitprof.Profiler class with stm, as an attempt to reduce conflicts.

2015-03-21 Thread arigo
Author: Armin Rigo ar...@tunes.org Branch: stmgc-c7 Changeset: r76484:3628a602564d Date: 2015-03-21 08:48 +0100 http://bitbucket.org/pypy/pypy/changeset/3628a602564d/ Log:Disable the jitprof.Profiler class with stm, as an attempt to reduce conflicts. diff --git

[pypy-commit] pypy stmgc-c7: import stmgc/5da5ba86b2fa

2015-03-21 Thread arigo
Author: Armin Rigo ar...@tunes.org Branch: stmgc-c7 Changeset: r76497:db478464880b Date: 2015-03-21 17:08 +0100 http://bitbucket.org/pypy/pypy/changeset/db478464880b/ Log:import stmgc/5da5ba86b2fa diff --git a/rpython/translator/stm/src_stm/revision b/rpython/translator/stm/src_stm/revision

[pypy-commit] pypy stmgc-c7: This test finally passes

2015-03-21 Thread arigo
Author: Armin Rigo ar...@tunes.org Branch: stmgc-c7 Changeset: r76498:9af0e8881e06 Date: 2015-03-21 17:10 +0100 http://bitbucket.org/pypy/pypy/changeset/9af0e8881e06/ Log:This test finally passes diff --git a/pypy/module/pypystm/test_pypy_c/test_no_conflict.py

[pypy-commit] stmgc default: Issue fix: if thread A is in stm_start_transaction(), it may call

2015-03-21 Thread arigo
Author: Armin Rigo ar...@tunes.org Branch: Changeset: r1738:5da5ba86b2fa Date: 2015-03-21 17:07 +0100 http://bitbucket.org/pypy/stmgc/changeset/5da5ba86b2fa/ Log:Issue fix: if thread A is in stm_start_transaction(), it may call enter_safe_point_if_requested(), and thread B might then

[pypy-commit] pypy stmgc-c7: Fix the simple weakrefs for STM: don't record them on the object for now.

2015-03-21 Thread arigo
Author: Armin Rigo ar...@tunes.org Branch: stmgc-c7 Changeset: r76488:2f54cdf1fe3c Date: 2015-03-21 11:19 +0100 http://bitbucket.org/pypy/pypy/changeset/2f54cdf1fe3c/ Log:Fix the simple weakrefs for STM: don't record them on the object for now. diff --git

[pypy-commit] pypy stmgc-c7: Oups

2015-03-21 Thread arigo
Author: Armin Rigo ar...@tunes.org Branch: stmgc-c7 Changeset: r76491:1a696d049ba6 Date: 2015-03-21 11:51 +0100 http://bitbucket.org/pypy/pypy/changeset/1a696d049ba6/ Log:Oups diff --git a/rpython/annotator/annrpython.py b/rpython/annotator/annrpython.py --- a/rpython/annotator/annrpython.py

[pypy-commit] pypy stmgc-c7: uh

2015-03-21 Thread arigo
Author: Armin Rigo ar...@tunes.org Branch: stmgc-c7 Changeset: r76489:652ec34956fa Date: 2015-03-21 11:21 +0100 http://bitbucket.org/pypy/pypy/changeset/652ec34956fa/ Log:uh diff --git a/rpython/annotator/bookkeeper.py b/rpython/annotator/bookkeeper.py --- a/rpython/annotator/bookkeeper.py

[pypy-commit] pypy stmgc-c7: Fix the conflict with 'fixed_graphs' by moving this tiny part of the logic

2015-03-21 Thread arigo
Author: Armin Rigo ar...@tunes.org Branch: stmgc-c7 Changeset: r76490:f390775085de Date: 2015-03-21 11:44 +0100 http://bitbucket.org/pypy/pypy/changeset/f390775085de/ Log:Fix the conflict with 'fixed_graphs' by moving this tiny part of the logic outside the transactions. diff --git

[pypy-commit] pypy stmgc-c7: fix: _processing_block may add new entries into must_call_setup

2015-03-21 Thread arigo
Author: Armin Rigo ar...@tunes.org Branch: stmgc-c7 Changeset: r76492:40ed22359f76 Date: 2015-03-21 12:00 +0100 http://bitbucket.org/pypy/pypy/changeset/40ed22359f76/ Log:fix: _processing_block may add new entries into must_call_setup diff --git a/rpython/rtyper/rtyper.py

[pypy-commit] pypy vmprof: kill a test for a killed feature

2015-03-21 Thread fijal
Author: Maciej Fijalkowski fij...@gmail.com Branch: vmprof Changeset: r76494:9f326dc014f4 Date: 2015-03-19 15:55 +0200 http://bitbucket.org/pypy/pypy/changeset/9f326dc014f4/ Log:kill a test for a killed feature diff --git a/pypy/module/__pypy__/test/test_special.py

[pypy-commit] pypy vmprof: more test fixing

2015-03-21 Thread fijal
Author: Maciej Fijalkowski fij...@gmail.com Branch: vmprof Changeset: r76493:c11d670ae976 Date: 2015-03-19 15:54 +0200 http://bitbucket.org/pypy/pypy/changeset/c11d670ae976/ Log:more test fixing diff --git a/rpython/jit/metainterp/test/test_warmstate.py

[pypy-commit] pypy stmgc-c7: fix some more conflicts

2015-03-21 Thread arigo
Author: Armin Rigo ar...@tunes.org Branch: stmgc-c7 Changeset: r76496:ea2e519614ab Date: 2015-03-21 12:34 +0100 http://bitbucket.org/pypy/pypy/changeset/ea2e519614ab/ Log:fix some more conflicts diff --git a/rpython/rtyper/rdict.py b/rpython/rtyper/rdict.py --- a/rpython/rtyper/rdict.py +++

[pypy-commit] cffi default: Some more classifiers

2015-03-21 Thread arigo
Author: Armin Rigo ar...@tunes.org Branch: Changeset: r1674:1c7b1e870144 Date: 2015-03-21 19:13 +0100 http://bitbucket.org/cffi/cffi/changeset/1c7b1e870144/ Log:Some more classifiers diff --git a/setup.py b/setup.py --- a/setup.py +++ b/setup.py @@ -162,5 +162,8 @@ 'Programming

[pypy-commit] pypy vmprof: (fijal, arigo) fix an obscure bug by saving/restoring errno, this is sooo obscure

2015-03-21 Thread fijal
Author: Maciej Fijalkowski fij...@gmail.com Branch: vmprof Changeset: r76499:f5cbfdb05c32 Date: 2015-03-21 23:23 +0200 http://bitbucket.org/pypy/pypy/changeset/f5cbfdb05c32/ Log:(fijal, arigo) fix an obscure bug by saving/restoring errno, this is sooo obscure diff --git