[pypy-svn] pypy jit-lsprofile: minimal things needed to make the JIT trace into the profiler

[cfbolz]

Author: Carl Friedrich Bolz <cfbolz at gmx.de>
Branch: jit-lsprofile
Changeset: r40360:4ce7e170838b
Date: 2011-01-03 22:40 +0100
http://bitbucket.org/pypy/pypy/changeset/4ce7e170838b/

Log:	minimal things needed to make the JIT trace into the profiler

diff --git a/pypy/module/pypyjit/interp_jit.py b/pypy/module/pypyjit/interp_jit.py
--- a/pypy/module/pypyjit/interp_jit.py
+++ b/pypy/module/pypyjit/interp_jit.py
@@ -38,7 +38,6 @@
 
 def confirm_enter_jit(next_instr, bytecode, frame, ec):
     return (frame.w_f_trace is None and
-            ec.profilefunc is None and
             ec.w_tracefunc is None)
 
 def can_never_inline(next_instr, bytecode):

diff --git a/pypy/module/pypyjit/policy.py b/pypy/module/pypyjit/policy.py
--- a/pypy/module/pypyjit/policy.py
+++ b/pypy/module/pypyjit/policy.py
@@ -12,7 +12,7 @@
         if '.' in modname:
             modname, _ = modname.split('.', 1)
         if modname in ['pypyjit', 'signal', 'micronumpy', 'math', 'exceptions',
-                       'imp', 'sys', 'array', '_ffi', 'itertools', 'operator']:
+                       'imp', 'sys', 'array', '_ffi', 'itertools', 'operator', '_lsprof']:
             return True
         return False