mirror of
				https://github.com/python/cpython.git
				synced 2025-10-31 10:26:02 +00:00 
			
		
		
		
	 3dbca81c9b
			
		
	
	
		3dbca81c9b
		
	
	
	
	
		
			
			svn+ssh://pythondev@svn.python.org/python/trunk ........ r65012 | jesse.noller | 2008-07-16 15:24:06 +0200 (Wed, 16 Jul 2008) | 2 lines Apply patch for issue 3090: ARCHFLAGS parsing incorrect ........ r65035 | georg.brandl | 2008-07-16 23:19:28 +0200 (Wed, 16 Jul 2008) | 2 lines #3045: fix pydoc behavior for TEMP path with spaces. ........ r65037 | georg.brandl | 2008-07-16 23:31:41 +0200 (Wed, 16 Jul 2008) | 2 lines #1608818: errno can get set by every call to readdir(). ........ r65038 | georg.brandl | 2008-07-17 00:04:20 +0200 (Thu, 17 Jul 2008) | 2 lines #3305: self->stream can be NULL. ........ r65039 | georg.brandl | 2008-07-17 00:09:17 +0200 (Thu, 17 Jul 2008) | 2 lines #3345: fix docstring. ........ r65040 | georg.brandl | 2008-07-17 00:33:18 +0200 (Thu, 17 Jul 2008) | 2 lines #3312: fix two sqlite3 crashes. ........ r65048 | georg.brandl | 2008-07-17 01:35:54 +0200 (Thu, 17 Jul 2008) | 2 lines #3388: add a paragraph about using "with" for file objects. ........ r65057 | gregory.p.smith | 2008-07-17 05:13:05 +0200 (Thu, 17 Jul 2008) | 2 lines news note for r63052 ........ r65077 | jesse.noller | 2008-07-17 23:01:05 +0200 (Thu, 17 Jul 2008) | 3 lines Fix issue 3395, update _debugInfo to be _debug_info ........ r65091 | ronald.oussoren | 2008-07-18 07:48:03 +0200 (Fri, 18 Jul 2008) | 2 lines Last bit of a fix for issue3381 (addon for my patch in r65061) ........ r65092 | vinay.sajip | 2008-07-18 10:59:06 +0200 (Fri, 18 Jul 2008) | 1 line Issue #3389: Allow resolving dotted names for handlers in logging configuration files. Thanks to Philip Jenvey for the patch. ........ r65093 | vinay.sajip | 2008-07-18 11:00:00 +0200 (Fri, 18 Jul 2008) | 1 line Issue #3389: Allow resolving dotted names for handlers in logging configuration files. Thanks to Philip Jenvey for the patch. ........ r65094 | vinay.sajip | 2008-07-18 11:00:35 +0200 (Fri, 18 Jul 2008) | 1 line Issue #3389: Allow resolving dotted names for handlers in logging configuration files. Thanks to Philip Jenvey for the patch. ........ r65095 | vinay.sajip | 2008-07-18 11:01:10 +0200 (Fri, 18 Jul 2008) | 1 line Issue #3389: Allow resolving dotted names for handlers in logging configuration files. Thanks to Philip Jenvey for the patch. ........ r65097 | georg.brandl | 2008-07-18 12:20:59 +0200 (Fri, 18 Jul 2008) | 2 lines Remove duplicate entry in __all__. ........ r65098 | georg.brandl | 2008-07-18 12:29:30 +0200 (Fri, 18 Jul 2008) | 2 lines Correct attribute name. ........ r65099 | georg.brandl | 2008-07-18 13:15:06 +0200 (Fri, 18 Jul 2008) | 3 lines Document the different meaning of precision for {:f} and {:g}. Also document how inf and nan are formatted. #3404. ........ r65127 | raymond.hettinger | 2008-07-19 02:42:03 +0200 (Sat, 19 Jul 2008) | 1 line Improve accuracy of gamma test function ........ r65128 | raymond.hettinger | 2008-07-19 02:43:00 +0200 (Sat, 19 Jul 2008) | 1 line Add recipe to the itertools docs. ........ r65131 | georg.brandl | 2008-07-19 12:08:55 +0200 (Sat, 19 Jul 2008) | 2 lines #3378: in case of no memory, don't leak even more memory. :) ........ r65133 | georg.brandl | 2008-07-19 14:39:10 +0200 (Sat, 19 Jul 2008) | 3 lines #3302: fix segfaults when passing None for arguments that can't be NULL for the C functions. ........ r65134 | georg.brandl | 2008-07-19 14:46:12 +0200 (Sat, 19 Jul 2008) | 2 lines #3303: fix crash with invalid Py_DECREF in strcoll(). ........ r65135 | georg.brandl | 2008-07-19 15:00:22 +0200 (Sat, 19 Jul 2008) | 3 lines #3319: don't raise ZeroDivisionError if number of rounds is so low that benchtime is zero. ........ r65136 | georg.brandl | 2008-07-19 15:09:42 +0200 (Sat, 19 Jul 2008) | 3 lines #3323: mention that if inheriting from a class without __slots__, the subclass will have a __dict__ available too. ........ r65139 | georg.brandl | 2008-07-19 15:48:44 +0200 (Sat, 19 Jul 2008) | 2 lines Add ordering info for findall and finditer. ........ r65149 | raymond.hettinger | 2008-07-20 01:21:57 +0200 (Sun, 20 Jul 2008) | 1 line Fix compress() recipe in docs to use itertools. ........ r65150 | raymond.hettinger | 2008-07-20 01:58:47 +0200 (Sun, 20 Jul 2008) | 1 line Clean-up itertools docs and recipes. ........ r65151 | gregory.p.smith | 2008-07-20 02:22:08 +0200 (Sun, 20 Jul 2008) | 9 lines fix issue3120 - don't truncate handles on 64-bit Windows. This is still messy, realistically PC/_subprocess.c should never cast pointers to python numbers and back at all. I don't have a 64-bit windows build environment because microsoft apparently thinks that should cost money. Time to watch the buildbots. It builds and passes tests on 32-bit windows. ........ r65155 | georg.brandl | 2008-07-20 13:50:29 +0200 (Sun, 20 Jul 2008) | 2 lines #926501: add info where to put the docstring. ........ r65158 | neal.norwitz | 2008-07-20 21:35:23 +0200 (Sun, 20 Jul 2008) | 1 line Fix a couple of names in error messages that were wrong ........ r65159 | neal.norwitz | 2008-07-20 22:39:36 +0200 (Sun, 20 Jul 2008) | 1 line Fix misspeeld method name (negative) ........ r65176 | amaury.forgeotdarc | 2008-07-21 23:36:24 +0200 (Mon, 21 Jul 2008) | 4 lines Increment version number in NEWS file, and move items that were added after 2.6b2. (I thought there was a script to automate this kind of updates) ........ r65177 | amaury.forgeotdarc | 2008-07-22 00:00:38 +0200 (Tue, 22 Jul 2008) | 5 lines Issue2378: pdb would delete free variables when stepping into a class statement. The problem was introduced by r53954, the correction is to restore the symmetry between PyFrame_FastToLocals and PyFrame_LocalsToFast ........ r65178 | benjamin.peterson | 2008-07-22 00:05:34 +0200 (Tue, 22 Jul 2008) | 1 line don't use assert statement ........ r65183 | ronald.oussoren | 2008-07-22 09:06:00 +0200 (Tue, 22 Jul 2008) | 2 lines Fix buglet in fix for issue3381 ........ r65184 | ronald.oussoren | 2008-07-22 09:06:33 +0200 (Tue, 22 Jul 2008) | 2 lines Fix build issue on OSX 10.4, somehow this wasn't committed before. ........ r65187 | raymond.hettinger | 2008-07-22 20:54:02 +0200 (Tue, 22 Jul 2008) | 1 line Remove out-of-date section on Exact/Inexact. ........ r65188 | raymond.hettinger | 2008-07-22 21:00:47 +0200 (Tue, 22 Jul 2008) | 1 line Tuples now have both count() and index(). ........ r65189 | raymond.hettinger | 2008-07-22 21:03:05 +0200 (Tue, 22 Jul 2008) | 1 line Fix credits for math.sum() ........ r65190 | raymond.hettinger | 2008-07-22 21:18:50 +0200 (Tue, 22 Jul 2008) | 1 line One more attribution. ........ r65192 | benjamin.peterson | 2008-07-23 01:44:37 +0200 (Wed, 23 Jul 2008) | 1 line remove unneeded import ........ r65194 | benjamin.peterson | 2008-07-23 15:25:06 +0200 (Wed, 23 Jul 2008) | 1 line use isinstance ........
		
			
				
	
	
		
			270 lines
		
	
	
	
		
			7.2 KiB
		
	
	
	
		
			Python
		
	
	
		
			Executable file
		
	
	
	
	
			
		
		
	
	
			270 lines
		
	
	
	
		
			7.2 KiB
		
	
	
	
		
			Python
		
	
	
		
			Executable file
		
	
	
	
	
| #! /usr/bin/env python
 | |
| 
 | |
| """
 | |
| "PYSTONE" Benchmark Program
 | |
| 
 | |
| Version:        Python/1.1 (corresponds to C/1.1 plus 2 Pystone fixes)
 | |
| 
 | |
| Author:         Reinhold P. Weicker,  CACM Vol 27, No 10, 10/84 pg. 1013.
 | |
| 
 | |
|                 Translated from ADA to C by Rick Richardson.
 | |
|                 Every method to preserve ADA-likeness has been used,
 | |
|                 at the expense of C-ness.
 | |
| 
 | |
|                 Translated from C to Python by Guido van Rossum.
 | |
| 
 | |
| Version History:
 | |
| 
 | |
|                 Version 1.1 corrects two bugs in version 1.0:
 | |
| 
 | |
|                 First, it leaked memory: in Proc1(), NextRecord ends
 | |
|                 up having a pointer to itself.  I have corrected this
 | |
|                 by zapping NextRecord.PtrComp at the end of Proc1().
 | |
| 
 | |
|                 Second, Proc3() used the operator != to compare a
 | |
|                 record to None.  This is rather inefficient and not
 | |
|                 true to the intention of the original benchmark (where
 | |
|                 a pointer comparison to None is intended; the !=
 | |
|                 operator attempts to find a method __cmp__ to do value
 | |
|                 comparison of the record).  Version 1.1 runs 5-10
 | |
|                 percent faster than version 1.0, so benchmark figures
 | |
|                 of different versions can't be compared directly.
 | |
| 
 | |
| """
 | |
| 
 | |
| LOOPS = 50000
 | |
| 
 | |
| from time import clock
 | |
| 
 | |
| __version__ = "1.1"
 | |
| 
 | |
| [Ident1, Ident2, Ident3, Ident4, Ident5] = range(1, 6)
 | |
| 
 | |
| class Record:
 | |
| 
 | |
|     def __init__(self, PtrComp = None, Discr = 0, EnumComp = 0,
 | |
|                        IntComp = 0, StringComp = 0):
 | |
|         self.PtrComp = PtrComp
 | |
|         self.Discr = Discr
 | |
|         self.EnumComp = EnumComp
 | |
|         self.IntComp = IntComp
 | |
|         self.StringComp = StringComp
 | |
| 
 | |
|     def copy(self):
 | |
|         return Record(self.PtrComp, self.Discr, self.EnumComp,
 | |
|                       self.IntComp, self.StringComp)
 | |
| 
 | |
| TRUE = 1
 | |
| FALSE = 0
 | |
| 
 | |
| def main(loops=LOOPS):
 | |
|     benchtime, stones = pystones(loops)
 | |
|     print("Pystone(%s) time for %d passes = %g" % \
 | |
|           (__version__, loops, benchtime))
 | |
|     print("This machine benchmarks at %g pystones/second" % stones)
 | |
| 
 | |
| 
 | |
| def pystones(loops=LOOPS):
 | |
|     return Proc0(loops)
 | |
| 
 | |
| IntGlob = 0
 | |
| BoolGlob = FALSE
 | |
| Char1Glob = '\0'
 | |
| Char2Glob = '\0'
 | |
| Array1Glob = [0]*51
 | |
| Array2Glob = list(map(lambda x: x[:], [Array1Glob]*51))
 | |
| PtrGlb = None
 | |
| PtrGlbNext = None
 | |
| 
 | |
| def Proc0(loops=LOOPS):
 | |
|     global IntGlob
 | |
|     global BoolGlob
 | |
|     global Char1Glob
 | |
|     global Char2Glob
 | |
|     global Array1Glob
 | |
|     global Array2Glob
 | |
|     global PtrGlb
 | |
|     global PtrGlbNext
 | |
| 
 | |
|     starttime = clock()
 | |
|     for i in range(loops):
 | |
|         pass
 | |
|     nulltime = clock() - starttime
 | |
| 
 | |
|     PtrGlbNext = Record()
 | |
|     PtrGlb = Record()
 | |
|     PtrGlb.PtrComp = PtrGlbNext
 | |
|     PtrGlb.Discr = Ident1
 | |
|     PtrGlb.EnumComp = Ident3
 | |
|     PtrGlb.IntComp = 40
 | |
|     PtrGlb.StringComp = "DHRYSTONE PROGRAM, SOME STRING"
 | |
|     String1Loc = "DHRYSTONE PROGRAM, 1'ST STRING"
 | |
|     Array2Glob[8][7] = 10
 | |
| 
 | |
|     starttime = clock()
 | |
| 
 | |
|     for i in range(loops):
 | |
|         Proc5()
 | |
|         Proc4()
 | |
|         IntLoc1 = 2
 | |
|         IntLoc2 = 3
 | |
|         String2Loc = "DHRYSTONE PROGRAM, 2'ND STRING"
 | |
|         EnumLoc = Ident2
 | |
|         BoolGlob = not Func2(String1Loc, String2Loc)
 | |
|         while IntLoc1 < IntLoc2:
 | |
|             IntLoc3 = 5 * IntLoc1 - IntLoc2
 | |
|             IntLoc3 = Proc7(IntLoc1, IntLoc2)
 | |
|             IntLoc1 = IntLoc1 + 1
 | |
|         Proc8(Array1Glob, Array2Glob, IntLoc1, IntLoc3)
 | |
|         PtrGlb = Proc1(PtrGlb)
 | |
|         CharIndex = 'A'
 | |
|         while CharIndex <= Char2Glob:
 | |
|             if EnumLoc == Func1(CharIndex, 'C'):
 | |
|                 EnumLoc = Proc6(Ident1)
 | |
|             CharIndex = chr(ord(CharIndex)+1)
 | |
|         IntLoc3 = IntLoc2 * IntLoc1
 | |
|         IntLoc2 = IntLoc3 / IntLoc1
 | |
|         IntLoc2 = 7 * (IntLoc3 - IntLoc2) - IntLoc1
 | |
|         IntLoc1 = Proc2(IntLoc1)
 | |
| 
 | |
|     benchtime = clock() - starttime - nulltime
 | |
|     if benchtime == 0.0:
 | |
|         loopsPerBenchtime = 0.0
 | |
|     else:
 | |
|         loopsPerBenchtime = (loops / benchtime)
 | |
|     return benchtime, loopsPerBenchtime
 | |
| 
 | |
| def Proc1(PtrParIn):
 | |
|     PtrParIn.PtrComp = NextRecord = PtrGlb.copy()
 | |
|     PtrParIn.IntComp = 5
 | |
|     NextRecord.IntComp = PtrParIn.IntComp
 | |
|     NextRecord.PtrComp = PtrParIn.PtrComp
 | |
|     NextRecord.PtrComp = Proc3(NextRecord.PtrComp)
 | |
|     if NextRecord.Discr == Ident1:
 | |
|         NextRecord.IntComp = 6
 | |
|         NextRecord.EnumComp = Proc6(PtrParIn.EnumComp)
 | |
|         NextRecord.PtrComp = PtrGlb.PtrComp
 | |
|         NextRecord.IntComp = Proc7(NextRecord.IntComp, 10)
 | |
|     else:
 | |
|         PtrParIn = NextRecord.copy()
 | |
|     NextRecord.PtrComp = None
 | |
|     return PtrParIn
 | |
| 
 | |
| def Proc2(IntParIO):
 | |
|     IntLoc = IntParIO + 10
 | |
|     while 1:
 | |
|         if Char1Glob == 'A':
 | |
|             IntLoc = IntLoc - 1
 | |
|             IntParIO = IntLoc - IntGlob
 | |
|             EnumLoc = Ident1
 | |
|         if EnumLoc == Ident1:
 | |
|             break
 | |
|     return IntParIO
 | |
| 
 | |
| def Proc3(PtrParOut):
 | |
|     global IntGlob
 | |
| 
 | |
|     if PtrGlb is not None:
 | |
|         PtrParOut = PtrGlb.PtrComp
 | |
|     else:
 | |
|         IntGlob = 100
 | |
|     PtrGlb.IntComp = Proc7(10, IntGlob)
 | |
|     return PtrParOut
 | |
| 
 | |
| def Proc4():
 | |
|     global Char2Glob
 | |
| 
 | |
|     BoolLoc = Char1Glob == 'A'
 | |
|     BoolLoc = BoolLoc or BoolGlob
 | |
|     Char2Glob = 'B'
 | |
| 
 | |
| def Proc5():
 | |
|     global Char1Glob
 | |
|     global BoolGlob
 | |
| 
 | |
|     Char1Glob = 'A'
 | |
|     BoolGlob = FALSE
 | |
| 
 | |
| def Proc6(EnumParIn):
 | |
|     EnumParOut = EnumParIn
 | |
|     if not Func3(EnumParIn):
 | |
|         EnumParOut = Ident4
 | |
|     if EnumParIn == Ident1:
 | |
|         EnumParOut = Ident1
 | |
|     elif EnumParIn == Ident2:
 | |
|         if IntGlob > 100:
 | |
|             EnumParOut = Ident1
 | |
|         else:
 | |
|             EnumParOut = Ident4
 | |
|     elif EnumParIn == Ident3:
 | |
|         EnumParOut = Ident2
 | |
|     elif EnumParIn == Ident4:
 | |
|         pass
 | |
|     elif EnumParIn == Ident5:
 | |
|         EnumParOut = Ident3
 | |
|     return EnumParOut
 | |
| 
 | |
| def Proc7(IntParI1, IntParI2):
 | |
|     IntLoc = IntParI1 + 2
 | |
|     IntParOut = IntParI2 + IntLoc
 | |
|     return IntParOut
 | |
| 
 | |
| def Proc8(Array1Par, Array2Par, IntParI1, IntParI2):
 | |
|     global IntGlob
 | |
| 
 | |
|     IntLoc = IntParI1 + 5
 | |
|     Array1Par[IntLoc] = IntParI2
 | |
|     Array1Par[IntLoc+1] = Array1Par[IntLoc]
 | |
|     Array1Par[IntLoc+30] = IntLoc
 | |
|     for IntIndex in range(IntLoc, IntLoc+2):
 | |
|         Array2Par[IntLoc][IntIndex] = IntLoc
 | |
|     Array2Par[IntLoc][IntLoc-1] = Array2Par[IntLoc][IntLoc-1] + 1
 | |
|     Array2Par[IntLoc+20][IntLoc] = Array1Par[IntLoc]
 | |
|     IntGlob = 5
 | |
| 
 | |
| def Func1(CharPar1, CharPar2):
 | |
|     CharLoc1 = CharPar1
 | |
|     CharLoc2 = CharLoc1
 | |
|     if CharLoc2 != CharPar2:
 | |
|         return Ident1
 | |
|     else:
 | |
|         return Ident2
 | |
| 
 | |
| def Func2(StrParI1, StrParI2):
 | |
|     IntLoc = 1
 | |
|     while IntLoc <= 1:
 | |
|         if Func1(StrParI1[IntLoc], StrParI2[IntLoc+1]) == Ident1:
 | |
|             CharLoc = 'A'
 | |
|             IntLoc = IntLoc + 1
 | |
|     if CharLoc >= 'W' and CharLoc <= 'Z':
 | |
|         IntLoc = 7
 | |
|     if CharLoc == 'X':
 | |
|         return TRUE
 | |
|     else:
 | |
|         if StrParI1 > StrParI2:
 | |
|             IntLoc = IntLoc + 7
 | |
|             return TRUE
 | |
|         else:
 | |
|             return FALSE
 | |
| 
 | |
| def Func3(EnumParIn):
 | |
|     EnumLoc = EnumParIn
 | |
|     if EnumLoc == Ident3: return TRUE
 | |
|     return FALSE
 | |
| 
 | |
| if __name__ == '__main__':
 | |
|     import sys
 | |
|     def error(msg):
 | |
|         print(msg, end=' ', file=sys.stderr)
 | |
|         print("usage: %s [number_of_loops]" % sys.argv[0], file=sys.stderr)
 | |
|         sys.exit(100)
 | |
|     nargs = len(sys.argv) - 1
 | |
|     if nargs > 1:
 | |
|         error("%d arguments are too many;" % nargs)
 | |
|     elif nargs == 1:
 | |
|         try: loops = int(sys.argv[1])
 | |
|         except ValueError:
 | |
|             error("Invalid argument %r;" % sys.argv[1])
 | |
|     else:
 | |
|         loops = LOOPS
 | |
|     main(loops)
 |