From: <ti...@co...> - 2009-07-25 02:34:28
|
Author: tismer Date: Sat Jul 25 04:37:19 2009 New Revision: 66616 Added: psyco/v2/dist/test/regrtester.skip Modified: psyco/v2/dist/MANIFEST psyco/v2/dist/c/Python/pycompiler.c psyco/v2/dist/c/files.py psyco/v2/dist/c/initialize.h psyco/v2/dist/c/psyco.c psyco/v2/dist/c/win32/psyco.vcproj psyco/v2/dist/py-support/__init__.py psyco/v2/dist/py-support/builtin.py psyco/v2/dist/py-support/core.py psyco/v2/dist/py-utils/manifest.py psyco/v2/dist/test/regrtester.py psyco/v2/dist/test/regrtester2.py psyco/v2/dist/test/test3.py psyco/v2/dist/test/test_compactobject.py Log: removed all profiling and thread related stuff, and did some clean-up. Got rid of alarm.c Right now, there is only psyco.full() and psyco.stop() Modified: psyco/v2/dist/MANIFEST ============================================================================== --- psyco/v2/dist/MANIFEST (original) +++ psyco/v2/dist/MANIFEST Sat Jul 25 04:37:19 2009 @@ -76,8 +76,6 @@ c/Python/pycompiler_loop.h c/Python/pycompiler_switch.h c/Python/pyver.h -c/alarm.c -c/alarm.h c/blockalloc.h c/codegen.c c/codegen.h @@ -157,6 +155,14 @@ doc/Makefile doc/README.txt doc/psycoguide.tex +psyco/__init__.py +psyco/builtin.py +psyco/classes.py +psyco/clibrary.py +psyco/core.py +psyco/kdictproxy.py +psyco/logger.py +psyco/support.py py-support/__init__.py py-support/builtin.py py-support/classes.py @@ -164,7 +170,6 @@ py-support/core.py py-support/kdictproxy.py py-support/logger.py -py-support/profiler.py py-support/support.py py-utils/cfg_switch.py py-utils/cvs.py @@ -187,6 +192,7 @@ test/file2-basetests.uu test/forever.py test/fulltester.py +test/fulltester_mingw32.py test/last_working_base.py test/life-psyco.py test/life.py Modified: psyco/v2/dist/c/Python/pycompiler.c ============================================================================== --- psyco/v2/dist/c/Python/pycompiler.c (original) +++ psyco/v2/dist/c/Python/pycompiler.c Sat Jul 25 04:37:19 2009 @@ -519,9 +519,9 @@ } PSY_INLINE void cimpl_set_exc_info(PyObject* target[], - PyObject** f_exc_type, - PyObject** f_exc_value, - PyObject** f_exc_traceback) + PyObject** f_exc_type, + PyObject** f_exc_value, + PyObject** f_exc_traceback) { /* Equivalent of PyErr_NormalizeException() + set_exc_info() */ PyThreadState *tstate = PyThreadState_GET(); Modified: psyco/v2/dist/c/files.py ============================================================================== --- psyco/v2/dist/c/files.py (original) +++ psyco/v2/dist/c/files.py Sat Jul 25 04:37:19 2009 @@ -32,7 +32,6 @@ Source('stats.c', 'psyco_stats_init'), Source('profile.c', 'psyco_profile_init'), Source('cstruct.c', 'psyco_cstruct_init'), - Source('alarm.c', 'psyco_alarm_init'), Source('codemanager.c'), Source('codegen.c', 'psyco_codegen_init'), Source('mergepoints.c'), Modified: psyco/v2/dist/c/initialize.h ============================================================================== --- psyco/v2/dist/c/initialize.h (original) +++ psyco/v2/dist/c/initialize.h Sat Jul 25 04:37:19 2009 @@ -47,7 +47,6 @@ void psyco_stats_init(void); /* stats.c */ void psyco_profile_init(void); /* profile.c */ void psyco_cstruct_init(void); /* cstruct.c */ - void psyco_alarm_init(void); /* alarm.c */ void psyco_codegen_init(void); /* codegen.c */ void psyco_pycompiler_init(void); /* Python/pycompiler.c */ void psyco_frames_init(void); /* Python/frames.c */ @@ -84,7 +83,6 @@ psyco_stats_init(); /* stats.c */ psyco_profile_init(); /* profile.c */ psyco_cstruct_init(); /* cstruct.c */ - psyco_alarm_init(); /* alarm.c */ psyco_codegen_init(); /* codegen.c */ psyco_pycompiler_init(); /* Python/pycompiler.c */ psyco_frames_init(); /* Python/frames.c */ Modified: psyco/v2/dist/c/psyco.c ============================================================================== --- psyco/v2/dist/c/psyco.c (original) +++ psyco/v2/dist/c/psyco.c Sat Jul 25 04:37:19 2009 @@ -6,7 +6,6 @@ #include "dispatcher.h" #include "Python/pycompiler.h" #include "Python/frames.h" -#include "alarm.h" #include "timing.h" #include "mergepoints.h" @@ -1037,7 +1036,6 @@ #if CODE_DUMP {"dumpcodebuf", &Psyco_dumpcodebuf, METH_VARARGS}, #endif - ALARM_FUNCTIONS, {NULL, NULL} /* Sentinel */ }; Modified: psyco/v2/dist/c/win32/psyco.vcproj ============================================================================== --- psyco/v2/dist/c/win32/psyco.vcproj (original) +++ psyco/v2/dist/c/win32/psyco.vcproj Sat Jul 25 04:37:19 2009 @@ -558,14 +558,6 @@ </File> </Filter> <File - RelativePath="..\..\c\alarm.c" - > - </File> - <File - RelativePath="..\alarm.h" - > - </File> - <File RelativePath="..\blockalloc.h" > </File> Modified: psyco/v2/dist/py-support/__init__.py ============================================================================== --- psyco/v2/dist/py-support/__init__.py (original) +++ psyco/v2/dist/py-support/__init__.py Sat Jul 25 04:37:19 2009 @@ -52,7 +52,7 @@ # Publish important data by importing them in the package from support import __version__, error, warning, _getrealframe, _getemulframe from support import version_info, __version__ as hexversion -from core import full, profile, background, runonly, stop, cannotcompile +from core import full, stop, cannotcompile from core import log, bind, unbind, proxy, unproxy, dumpcodebuf from _psyco import setfilter from _psyco import compact, compacttype Modified: psyco/v2/dist/py-support/builtin.py ============================================================================== --- psyco/v2/dist/py-support/builtin.py (original) +++ psyco/v2/dist/py-support/builtin.py Sat Jul 25 04:37:19 2009 @@ -154,19 +154,23 @@ ## return _filter(func, sequence) ## return [x for x in sequence if func(x)] -@register -def all(v): - for item in iter(v): - if not item: - return False - return True - -@register -def any(v): - for item in iter(v): - if item: - return True - return False +try: + any, all + @register + def all(v): + for item in iter(v): + if not item: + return False + return True + + @register + def any(v): + for item in iter(v): + if item: + return True + return False +except NameError: + pass class _xrange: # XXX register this once generators get attached to the profiler Modified: psyco/v2/dist/py-support/core.py ============================================================================== --- psyco/v2/dist/py-support/core.py (original) +++ psyco/v2/dist/py-support/core.py Sat Jul 25 04:37:19 2009 @@ -14,7 +14,7 @@ import psyco psyco.log('/tmp/psyco.log') - psyco.profile() + psyco.full() """ ########################################################################### @@ -23,71 +23,17 @@ from support import * -# Default charge profiler values -default_watermark = 0.09 # between 0.0 (0%) and 1.0 (100%) -default_halflife = 0.5 # seconds -default_pollfreq_profile = 20 # Hz -default_pollfreq_background = 100 # Hz -- a maximum for sleep's resolution -default_parentframe = 0.25 # should not be more than 0.5 (50%) - -# XXX note: -# import profiler, logger -# gives trouble if done at module level! -# file descriptors get wrong. - -def full(memory=None, time=None, memorymax=None, timemax=None): +def full(): """Compile as much as possible. Typical use is for small scripts performing intensive computations or string handling.""" - import profiler - p = profiler.FullCompiler() - p.run(memory, time, memorymax, timemax) - - -def profile(watermark = default_watermark, - halflife = default_halflife, - pollfreq = default_pollfreq_profile, - parentframe = default_parentframe, - memory=None, time=None, memorymax=None, timemax=None): - """Turn on profiling. - -The 'watermark' parameter controls how easily running functions will -be compiled. The smaller the value, the more functions are compiled.""" - import profiler - p = profiler.ActivePassiveProfiler(watermark, halflife, - pollfreq, parentframe) - p.run(memory, time, memorymax, timemax) - - -def background(watermark = default_watermark, - halflife = default_halflife, - pollfreq = default_pollfreq_background, - parentframe = default_parentframe, - memory=None, time=None, memorymax=None, timemax=None): - """Turn on passive profiling. - -This is a very lightweight mode in which only intensively computing -functions can be detected. The smaller the 'watermark', the more functions -are compiled.""" - import profiler - p = profiler.PassiveProfiler(watermark, halflife, pollfreq, parentframe) - p.run(memory, time, memorymax, timemax) - - -def runonly(memory=None, time=None, memorymax=None, timemax=None): - """Nonprofiler. - -XXX check if this is useful and document.""" - import profiler - p = profiler.RunOnly() - p.run(memory, time, memorymax, timemax) + _psyco.profiling('f') def stop(): """Turn off all automatic compilation. bind() calls remain in effect.""" - import profiler - profiler.go(stop=1) + _psyco.profiling('.') def log(logfile='', mode='w', top=10): Modified: psyco/v2/dist/py-utils/manifest.py ============================================================================== --- psyco/v2/dist/py-utils/manifest.py (original) +++ psyco/v2/dist/py-utils/manifest.py Sat Jul 25 04:37:19 2009 @@ -1,4 +1,3 @@ -from __future__ import generators import os import py # the py lib, see http://codespeak.net/py @@ -6,6 +5,9 @@ path = py.path.svnwc(os.pardir) for p in path.visit(lambda x: x.check(versioned=1)): if p.check(dir=1): + if os.path.split(str(p))[-1] == 'psyco': + # this is my local duplicate of py-support, skip it + continue print p else: yield p.relto(path).replace('\\', '/') Modified: psyco/v2/dist/test/regrtester.py ============================================================================== --- psyco/v2/dist/test/regrtester.py (original) +++ psyco/v2/dist/test/regrtester.py Sat Jul 25 04:37:19 2009 @@ -58,6 +58,7 @@ 'test_zipimport_support': 'tries to write frame locals, which is not supported', 'test_operations': 'no idea what to do with this', 'test_multiprocessing': 'still not reliable, some threading issue', + 'test_socket_ssl': 'not sure what happens here. TypeError: bind_port() takes at most 2 arguments (3 given)', } # SKIP['test_operator'] = NO_SYS_EXC # SKIP['test_strop'] = NO_SYS_EXC @@ -87,4 +88,5 @@ test.regrtest.main(randomize=1) assert __in_psyco__, 'lost psyco-ness' finally: + psyco.stop() psyco.dumpcodebuf() Added: psyco/v2/dist/test/regrtester.skip ============================================================================== --- (empty file) +++ psyco/v2/dist/test/regrtester.skip Sat Jul 25 04:37:19 2009 @@ -0,0 +1,11 @@ +import sys +# tests which worked on windows, but not on darwin +if sys.platform != 'win32': + if sys.version_info[:3] == (2, 6, 2): + SKIP['test_decimal'] = 'hoping that somebody finds it' + SKIP['test_rgbimg'] = 'hoping that somebody finds it' + SKIP['test_file'] = 'threading problem in test_close_open' + if sys.version_info[:3] == (2, 4, 6): + SKIP['test_asynchat'] = 'threads are not reliable right now' + if sys.version_info[:2] == (2, 5): + SKIP['test_sqlite'] = 'dumps core from time to time' Modified: psyco/v2/dist/test/regrtester2.py ============================================================================== --- psyco/v2/dist/test/regrtester2.py (original) +++ psyco/v2/dist/test/regrtester2.py Sat Jul 25 04:37:19 2009 @@ -86,5 +86,4 @@ psyco.dumpcodebuf() if fully_in_psyco: assert confirm_still_in_psyco() - - + psyco.stop() Modified: psyco/v2/dist/test/test3.py ============================================================================== --- psyco/v2/dist/test/test3.py (original) +++ psyco/v2/dist/test/test3.py Sat Jul 25 04:37:19 2009 @@ -1,4 +1,3 @@ -#from __future__ import generators #from __future__ import division import psyco, os, sys, array, operator, traceback from time import sleep, clock Modified: psyco/v2/dist/test/test_compactobject.py ============================================================================== --- psyco/v2/dist/test/test_compactobject.py (original) +++ psyco/v2/dist/test/test_compactobject.py Sat Jul 25 04:37:19 2009 @@ -1,4 +1,3 @@ -from __future__ import generators import os, sys, random import psyco |