merge oprofile-support branch:

    ------------------------------------------------------------------------
    r70949 | cfbolz | 2010-01-28 14:10:03 +0100 (Thu, 28 Jan 2010) | 2 lines
    Changed paths:
       A /pypy/branch/oprofile-support (from /pypy/trunk:70948)

    a branch where I want to try to support oprofile

    ------------------------------------------------------------------------
    r70957 | cfbolz | 2010-01-28 18:10:21 +0100 (Thu, 28 Jan 2010) | 3 lines
    Changed paths:
       M /pypy/branch/oprofile-support/pypy/jit/backend/model.py
       M /pypy/branch/oprofile-support/pypy/jit/metainterp/warmspot.py

    Add a finish_once methods on the CPU that will be called when the program
    shuts down.

    ------------------------------------------------------------------------
    r71030 | cfbolz | 2010-02-01 13:54:24 +0100 (Mon, 01 Feb 2010) | 2 lines
    Changed paths:
       M /pypy/branch/oprofile-support/pypy/jit/metainterp/warmspot.py

    this belongs to r70957

    ------------------------------------------------------------------------
    r71031 | cfbolz | 2010-02-01 13:55:31 +0100 (Mon, 01 Feb 2010) | 2 lines
    Changed paths:
       A /pypy/branch/oprofile-support/pypy/jit/backend/x86/oprofile.py

    rffi code to interact with oprofile

    ------------------------------------------------------------------------
    r71062 | cfbolz | 2010-02-02 16:22:08 +0100 (Tue, 02 Feb 2010) | 4 lines
    Changed paths:
       M /pypy/branch/oprofile-support/pypy/jit/backend/x86/assembler.py
       A /pypy/branch/oprofile-support/pypy/jit/backend/x86/profagent.py
       M /pypy/branch/oprofile-support/pypy/jit/backend/x86/test/test_assembler.py

    Steps in the direction of nicely integrating profilers: add start/end_function
    methods to MachineCodeBlockWrapper, which makes it give assembler address range
    information to the profiler.

    ------------------------------------------------------------------------
    r71064 | cfbolz | 2010-02-02 17:01:10 +0100 (Tue, 02 Feb 2010) | 4 lines
    Changed paths:
       M /pypy/branch/oprofile-support/pypy/jit/backend/x86/assembler.py
       M /pypy/branch/oprofile-support/pypy/jit/backend/x86/runner.py
       M /pypy/branch/oprofile-support/pypy/jit/backend/x86/test/test_assembler.py

    Change the assembler to pass function name information on to the profiler. Right
    now, the first debug_merge_point that is found is used as the name of the
    function.

    ------------------------------------------------------------------------
    r71066 | cfbolz | 2010-02-02 17:38:46 +0100 (Tue, 02 Feb 2010) | 2 lines
    Changed paths:
       M /pypy/branch/oprofile-support/pypy/jit/backend/x86/test/test_runner.py

    oops, this belongs to the last commit

    ------------------------------------------------------------------------
    r71067 | cfbolz | 2010-02-02 17:40:30 +0100 (Tue, 02 Feb 2010) | 2 lines
    Changed paths:
       M /pypy/branch/oprofile-support/pypy/config/translationoption.py
       M /pypy/branch/oprofile-support/pypy/jit/backend/x86/oprofile.py
       M /pypy/branch/oprofile-support/pypy/jit/backend/x86/profagent.py
       M /pypy/branch/oprofile-support/pypy/jit/backend/x86/runner.py

    integrate oprofile

------------------------------------------------------------------------

1 files changed, 3 insertions, 0 deletions

diff --git a/pypy/config/translationoption.py b/pypy/config/translationoption.py
index ad6e1c1ca9..008f3fa1d1 100644
--- a/pypy/config/translationoption.py
+++ b/pypy/config/translationoption.py
@@ -108,6 +108,9 @@ translation_optiondescription = OptionDescription(
                  ["off", "profile", "steps", "detailed"],
                  default="profile",      # XXX for now
                  cmdline="--jit-debug"),
+    ChoiceOption("jit_profiler", "integrate profiler support into the JIT",
+                 ["off", "oprofile"],
+                 default="off"),
 
     # misc
     BoolOption("verbose", "Print extra information", default=False),