[pypy-svn] r40840 - in pypy/dist/pypy: module/pypyjit translator

[pedronis at codespeak.net]

Author: pedronis
Date: Tue Mar 20 14:56:05 2007
New Revision: 40840

Modified:
   pypy/dist/pypy/module/pypyjit/portal.py
   pypy/dist/pypy/translator/geninterplevel.py
Log:
(arre, pedronis) saner (?) and caching invariant way to skip geninterped graphs when timeshifting.



Modified: pypy/dist/pypy/module/pypyjit/portal.py
==============================================================================
--- pypy/dist/pypy/module/pypyjit/portal.py	(original)
+++ pypy/dist/pypy/module/pypyjit/portal.py	Tue Mar 20 14:56:05 2007
@@ -20,7 +20,7 @@
         mod = func.__module__ or '?'
         if mod.startswith('pypy.objspace'):
             return False
-        if mod.startswith('pypy._cache'):
+        if '_geninterp_' in func.func_globals # skip all geninterped stuff
             return False
         if mod.startswith('pypy.interpreter.astcompiler'):
             return False

Modified: pypy/dist/pypy/translator/geninterplevel.py
==============================================================================
--- pypy/dist/pypy/translator/geninterplevel.py	(original)
+++ pypy/dist/pypy/translator/geninterplevel.py	Tue Mar 20 14:56:05 2007
@@ -72,7 +72,7 @@
 log = py.log.Producer("geninterp")
 py.log.setconsumer("geninterp", ansi_log)
 
-GI_VERSION = '1.1.22'  # bump this for substantial changes
+GI_VERSION = '1.1.23'  # bump this for substantial changes
 # ____________________________________________________________
 
 try:
@@ -1399,6 +1399,8 @@
     RPY_SEP = "#*************************************************************"
 
     RPY_INIT_HEADER = RPY_SEP + '''
+#__name__ = %(modname)r
+_geninterp_ = True
 
 def init%(modname)s(space):
   """NOT_RPYTHON"""