mirror of
https://github.com/python/cpython.git
synced 2024-12-18 06:14:00 +08:00
89f507fe8c
Merged revisions 51434-53004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r51434 | neal.norwitz | 2006-08-21 20:20:10 +0200 (Mon, 21 Aug 2006) | 1 line Fix a couple of ssize-t issues reported by Alexander Belopolsky on python-dev ........ r51439 | neal.norwitz | 2006-08-21 21:47:08 +0200 (Mon, 21 Aug 2006) | 6 lines Patch #1542451: disallow continue anywhere under a finally I'm undecided if this should be backported to 2.5 or 2.5.1. Armin suggested to wait (I'm of the same opinion). Thomas W thinks it's fine to go in 2.5. ........ r51443 | neal.norwitz | 2006-08-21 22:16:24 +0200 (Mon, 21 Aug 2006) | 4 lines Handle a few more error conditions. Klocwork 301 and 302. Will backport. ........ r51450 | neal.norwitz | 2006-08-22 00:21:19 +0200 (Tue, 22 Aug 2006) | 5 lines Patch #1541585: fix buffer overrun when performing repr() on a unicode string in a build with wide unicode (UCS-4) support. This code could be improved, so add an XXX comment. ........ r51456 | neal.norwitz | 2006-08-22 01:44:48 +0200 (Tue, 22 Aug 2006) | 1 line Try to get the windows bots working again with the new peephole.c ........ r51461 | anthony.baxter | 2006-08-22 09:36:59 +0200 (Tue, 22 Aug 2006) | 1 line patch for documentation for recent uuid changes (from ping) ........ r51473 | neal.norwitz | 2006-08-22 15:56:56 +0200 (Tue, 22 Aug 2006) | 1 line Alexander Belopolsky pointed out that pos is a size_t ........ r51489 | jeremy.hylton | 2006-08-22 22:46:00 +0200 (Tue, 22 Aug 2006) | 2 lines Expose column offset information in parse trees. ........ r51497 | andrew.kuchling | 2006-08-23 01:13:43 +0200 (Wed, 23 Aug 2006) | 1 line Move functional howto into trunk ........ r51515 | jeremy.hylton | 2006-08-23 20:37:43 +0200 (Wed, 23 Aug 2006) | 2 lines Baby steps towards better tests for tokenize ........ r51525 | alex.martelli | 2006-08-23 22:42:02 +0200 (Wed, 23 Aug 2006) | 6 lines x**2 should about equal x*x (including for a float x such that the result is inf) but didn't; added a test to test_float to verify that, and ignored the ERANGE value for errno in the pow operation to make the new test pass (with help from Marilyn Davis at the Google Python Sprint -- thanks!). ........ r51526 | jeremy.hylton | 2006-08-23 23:14:03 +0200 (Wed, 23 Aug 2006) | 20 lines Bug fixes large and small for tokenize. Small: Always generate a NL or NEWLINE token following a COMMENT token. The old code did not generate an NL token if the comment was on a line by itself. Large: The output of untokenize() will now match the input exactly if it is passed the full token sequence. The old, crufty output is still generated if a limited input sequence is provided, where limited means that it does not include position information for tokens. Remaining bug: There is no CONTINUATION token (\) so there is no way for untokenize() to handle such code. Also, expanded the number of doctests in hopes of eventually removing the old-style tests that compare against a golden file. Bug fix candidate for Python 2.5.1. (Sigh.) ........ r51527 | jeremy.hylton | 2006-08-23 23:26:46 +0200 (Wed, 23 Aug 2006) | 5 lines Replace dead code with an assert. Now that COMMENT tokens are reliably followed by NL or NEWLINE, there is never a need to add extra newlines in untokenize. ........ r51530 | alex.martelli | 2006-08-24 00:17:59 +0200 (Thu, 24 Aug 2006) | 7 lines Reverting the patch that tried to fix the issue whereby x**2 raises OverflowError while x*x succeeds and produces infinity; apparently these inconsistencies cannot be fixed across ``all'' platforms and there's a widespread feeling that therefore ``every'' platform should keep suffering forevermore. Ah well. ........ r51565 | thomas.wouters | 2006-08-24 20:40:20 +0200 (Thu, 24 Aug 2006) | 6 lines Fix SF bug #1545837: array.array borks on deepcopy. array.__deepcopy__() needs to take an argument, even if it doesn't actually use it. Will backport to 2.5 and 2.4 (if applicable.) ........ r51580 | martin.v.loewis | 2006-08-25 02:03:34 +0200 (Fri, 25 Aug 2006) | 3 lines Patch #1545507: Exclude ctypes package in Win64 MSI file. Will backport to 2.5. ........ r51589 | neal.norwitz | 2006-08-25 03:52:49 +0200 (Fri, 25 Aug 2006) | 1 line importing types is not necessary if we use isinstance ........ r51604 | thomas.heller | 2006-08-25 09:27:33 +0200 (Fri, 25 Aug 2006) | 3 lines Port _ctypes.pyd to win64 on AMD64. ........ r51605 | thomas.heller | 2006-08-25 09:34:51 +0200 (Fri, 25 Aug 2006) | 3 lines Add missing file for _ctypes.pyd port to win64 on AMD64. ........ r51606 | thomas.heller | 2006-08-25 11:26:33 +0200 (Fri, 25 Aug 2006) | 6 lines Build _ctypes.pyd for win AMD64 into the MSVC project file. Since MSVC doesn't know about .asm files, a helper batch file is needed to find ml64.exe in predefined locations. The helper script hardcodes the path to the MS Platform SDK. ........ r51608 | armin.rigo | 2006-08-25 14:44:28 +0200 (Fri, 25 Aug 2006) | 4 lines The regular expression engine in '_sre' can segfault when interpreting bogus bytecode. It is unclear whether this is a real bug or a "won't fix" case like bogus_code_obj.py. ........ r51617 | tim.peters | 2006-08-26 00:05:39 +0200 (Sat, 26 Aug 2006) | 2 lines Whitespace normalization. ........ r51618 | tim.peters | 2006-08-26 00:06:44 +0200 (Sat, 26 Aug 2006) | 2 lines Add missing svn:eol-style property to text files. ........ r51619 | tim.peters | 2006-08-26 00:26:21 +0200 (Sat, 26 Aug 2006) | 3 lines A new test here relied on preserving invisible trailing whitespace in expected output. Stop that. ........ r51624 | jack.diederich | 2006-08-26 20:42:06 +0200 (Sat, 26 Aug 2006) | 4 lines - Move functions common to all path modules into genericpath.py and have the OS speicifc path modules import them. - Have os2emxpath import common functions fron ntpath instead of using copies ........ r51642 | neal.norwitz | 2006-08-29 07:40:58 +0200 (Tue, 29 Aug 2006) | 1 line Fix a couple of typos. ........ r51647 | marc-andre.lemburg | 2006-08-29 12:34:12 +0200 (Tue, 29 Aug 2006) | 5 lines Fix a buglet in the error reporting (SF bug report #1546372). This should probably go into Python 2.5 or 2.5.1 as well. ........ r51663 | armin.rigo | 2006-08-31 10:51:06 +0200 (Thu, 31 Aug 2006) | 3 lines Doc fix: hashlib objects don't always return a digest of 16 bytes. Backport candidate for 2.5. ........ r51664 | nick.coghlan | 2006-08-31 14:00:43 +0200 (Thu, 31 Aug 2006) | 1 line Fix the wrongheaded implementation of context management in the decimal module and add unit tests. (python-dev discussion is ongoing regarding what we do about Python 2.5) ........ r51665 | nick.coghlan | 2006-08-31 14:51:25 +0200 (Thu, 31 Aug 2006) | 1 line Remove the old decimal context management tests from test_contextlib (guess who didn't run the test suite before committing...) ........ r51669 | brett.cannon | 2006-08-31 20:54:26 +0200 (Thu, 31 Aug 2006) | 4 lines Make sure memory is properly cleaned up in file_init. Backport candidate. ........ r51671 | brett.cannon | 2006-08-31 23:47:52 +0200 (Thu, 31 Aug 2006) | 2 lines Fix comment about indentation level in C files. ........ r51674 | brett.cannon | 2006-09-01 00:42:37 +0200 (Fri, 01 Sep 2006) | 3 lines Have pre-existing C files use 8 spaces indents (to match old PEP 7 style), but have all new files use 4 spaces (to match current PEP 7 style). ........ r51676 | fred.drake | 2006-09-01 05:57:19 +0200 (Fri, 01 Sep 2006) | 3 lines - SF patch #1550263: Enhance and correct unittest docs - various minor cleanups for improved consistency ........ r51677 | georg.brandl | 2006-09-02 00:30:52 +0200 (Sat, 02 Sep 2006) | 2 lines evalfile() should be execfile(). ........ r51681 | neal.norwitz | 2006-09-02 04:43:17 +0200 (Sat, 02 Sep 2006) | 1 line SF #1547931, fix typo (missing and). Will backport to 2.5 ........ r51683 | neal.norwitz | 2006-09-02 04:50:35 +0200 (Sat, 02 Sep 2006) | 1 line Bug #1548092: fix curses.tparm seg fault on invalid input. Needs backport to 2.5.1 and earlier. ........ r51684 | neal.norwitz | 2006-09-02 04:58:13 +0200 (Sat, 02 Sep 2006) | 4 lines Bug #1550714: fix SystemError from itertools.tee on negative value for n. Needs backport to 2.5.1 and earlier. ........ r51685 | nick.coghlan | 2006-09-02 05:54:17 +0200 (Sat, 02 Sep 2006) | 1 line Make decimal.ContextManager a private implementation detail of decimal.localcontext() ........ r51686 | nick.coghlan | 2006-09-02 06:04:18 +0200 (Sat, 02 Sep 2006) | 1 line Further corrections to the decimal module context management documentation ........ r51688 | raymond.hettinger | 2006-09-02 19:07:23 +0200 (Sat, 02 Sep 2006) | 1 line Fix documentation nits for decimal context managers. ........ r51690 | neal.norwitz | 2006-09-02 20:51:34 +0200 (Sat, 02 Sep 2006) | 1 line Add missing word in comment ........ r51691 | neal.norwitz | 2006-09-02 21:40:19 +0200 (Sat, 02 Sep 2006) | 7 lines Hmm, this test has failed at least twice recently on the OpenBSD and Debian sparc buildbots. Since this goes through a lot of tests and hits the disk a lot it could be slow (especially if NFS is involved). I'm not sure if that's the problem, but printing periodic msgs shouldn't hurt. The code was stolen from test_compiler. ........ r51693 | nick.coghlan | 2006-09-03 03:02:00 +0200 (Sun, 03 Sep 2006) | 1 line Fix final documentation nits before backporting decimal module fixes to 2.5 ........ r51694 | nick.coghlan | 2006-09-03 03:06:07 +0200 (Sun, 03 Sep 2006) | 1 line Typo fix for decimal docs ........ r51697 | nick.coghlan | 2006-09-03 03:20:46 +0200 (Sun, 03 Sep 2006) | 1 line NEWS entry on trunk for decimal module changes ........ r51704 | raymond.hettinger | 2006-09-04 17:32:48 +0200 (Mon, 04 Sep 2006) | 1 line Fix endcase for str.rpartition() ........ r51716 | tim.peters | 2006-09-05 04:18:09 +0200 (Tue, 05 Sep 2006) | 12 lines "Conceptual" merge of rev 51711 from the 2.5 branch. i_divmod(): As discussed on Python-Dev, changed the overflow checking to live happily with recent gcc optimizations that assume signed integer arithmetic never overflows. This differs from the corresponding change on the 2.5 and 2.4 branches, using a less obscure approach, but one that /may/ tickle platform idiocies in their definitions of LONG_MIN. The 2.4 + 2.5 change avoided introducing a dependence on LONG_MIN, at the cost of substantially goofier code. ........ r51717 | tim.peters | 2006-09-05 04:21:19 +0200 (Tue, 05 Sep 2006) | 2 lines Whitespace normalization. ........ r51719 | tim.peters | 2006-09-05 04:22:17 +0200 (Tue, 05 Sep 2006) | 2 lines Add missing svn:eol-style property to text files. ........ r51720 | neal.norwitz | 2006-09-05 04:24:03 +0200 (Tue, 05 Sep 2006) | 2 lines Fix SF bug #1546288, crash in dict_equal. ........ r51721 | neal.norwitz | 2006-09-05 04:25:41 +0200 (Tue, 05 Sep 2006) | 1 line Fix SF #1552093, eval docstring typo (3 ps in mapping) ........ r51724 | neal.norwitz | 2006-09-05 04:35:08 +0200 (Tue, 05 Sep 2006) | 1 line This was found by Guido AFAIK on p3yk (sic) branch. ........ r51725 | neal.norwitz | 2006-09-05 04:36:20 +0200 (Tue, 05 Sep 2006) | 1 line Add a NEWS entry for str.rpartition() change ........ r51728 | neal.norwitz | 2006-09-05 04:57:01 +0200 (Tue, 05 Sep 2006) | 1 line Patch #1540470, for OpenBSD 4.0. Backport candidate for 2.[34]. ........ r51729 | neal.norwitz | 2006-09-05 05:53:08 +0200 (Tue, 05 Sep 2006) | 12 lines Bug #1520864 (again): unpacking singleton tuples in list comprehensions and generator expressions (x for x, in ... ) works again. Sigh, I only fixed for loops the first time, not list comps and genexprs too. I couldn't find any more unpacking cases where there is a similar bug lurking. This code should be refactored to eliminate the duplication. I'm sure the listcomp/genexpr code can be refactored. I'm not sure if the for loop can re-use any of the same code though. Will backport to 2.5 (the only place it matters). ........ r51731 | neal.norwitz | 2006-09-05 05:58:26 +0200 (Tue, 05 Sep 2006) | 1 line Add a comment about some refactoring. (There's probably more that should be done.) I will reformat this file in the next checkin due to the inconsistent tabs/spaces. ........ r51732 | neal.norwitz | 2006-09-05 06:00:12 +0200 (Tue, 05 Sep 2006) | 1 line M-x untabify ........ r51737 | hyeshik.chang | 2006-09-05 14:07:09 +0200 (Tue, 05 Sep 2006) | 7 lines Fix a few bugs on cjkcodecs found by Oren Tirosh: - gbk and gb18030 codec now handle U+30FB KATAKANA MIDDLE DOT correctly. - iso2022_jp_2 codec now encodes into G0 for KS X 1001, GB2312 codepoints to conform the standard. - iso2022_jp_3 and iso2022_jp_2004 codec can encode JIS X 2013:2 codepoints now. ........ r51738 | hyeshik.chang | 2006-09-05 14:14:57 +0200 (Tue, 05 Sep 2006) | 2 lines Fix a typo: 2013 -> 0213 ........ r51740 | georg.brandl | 2006-09-05 14:44:58 +0200 (Tue, 05 Sep 2006) | 3 lines Bug #1552618: change docs of dict.has_key() to reflect recommendation to use "in". ........ r51742 | andrew.kuchling | 2006-09-05 15:02:40 +0200 (Tue, 05 Sep 2006) | 1 line Rearrange example a bit, and show rpartition() when separator is not found ........ r51744 | andrew.kuchling | 2006-09-05 15:15:41 +0200 (Tue, 05 Sep 2006) | 1 line [Bug #1525469] SimpleXMLRPCServer still uses the sys.exc_{value,type} module-level globals instead of calling sys.exc_info(). Reported by Russell Warren ........ r51745 | andrew.kuchling | 2006-09-05 15:19:18 +0200 (Tue, 05 Sep 2006) | 3 lines [Bug #1526834] Fix crash in pdb when you do 'b f('; the function name was placed into a regex pattern and the unbalanced paren caused re.compile() to report an error ........ r51751 | kristjan.jonsson | 2006-09-05 19:58:12 +0200 (Tue, 05 Sep 2006) | 6 lines Update the PCBuild8 solution. Facilitate cross-compilation by having binaries in separate Win32 and x64 directories. Rationalized configs by making proper use of platforms/configurations. Remove pythoncore_pgo project. Add new PGIRelease and PGORelease configurations to perform Profile Guided Optimisation. Removed I64 support, but this can be easily added by copying the x64 platform settings. ........ r51758 | gustavo.niemeyer | 2006-09-06 03:58:52 +0200 (Wed, 06 Sep 2006) | 3 lines Fixing #1531862: Do not close standard file descriptors in the subprocess module. ........ r51760 | neal.norwitz | 2006-09-06 05:58:34 +0200 (Wed, 06 Sep 2006) | 1 line Revert 51758 because it broke all the buildbots ........ r51762 | georg.brandl | 2006-09-06 08:03:59 +0200 (Wed, 06 Sep 2006) | 3 lines Bug #1551427: fix a wrong NULL pointer check in the win32 version of os.urandom(). ........ r51765 | georg.brandl | 2006-09-06 08:09:31 +0200 (Wed, 06 Sep 2006) | 3 lines Bug #1550983: emit better error messages for erroneous relative imports (if not in package and if beyond toplevel package). ........ r51767 | neal.norwitz | 2006-09-06 08:28:06 +0200 (Wed, 06 Sep 2006) | 1 line with and as are now keywords. There are some generated files I can't recreate. ........ r51770 | georg.brandl | 2006-09-06 08:50:05 +0200 (Wed, 06 Sep 2006) | 5 lines Bug #1542051: Exceptions now correctly call PyObject_GC_UnTrack. Also make sure that every exception class has __module__ set to 'exceptions'. ........ r51785 | georg.brandl | 2006-09-06 22:05:58 +0200 (Wed, 06 Sep 2006) | 2 lines Fix missing import of the types module in logging.config. ........ r51789 | marc-andre.lemburg | 2006-09-06 22:40:22 +0200 (Wed, 06 Sep 2006) | 3 lines Add news item for bug fix of SF bug report #1546372. ........ r51797 | gustavo.niemeyer | 2006-09-07 02:48:33 +0200 (Thu, 07 Sep 2006) | 3 lines Fixed subprocess bug #1531862 again, after removing tests offending buildbot ........ r51798 | raymond.hettinger | 2006-09-07 04:42:48 +0200 (Thu, 07 Sep 2006) | 1 line Fix refcounts and add error checks. ........ r51803 | nick.coghlan | 2006-09-07 12:50:34 +0200 (Thu, 07 Sep 2006) | 1 line Fix the speed regression in inspect.py by adding another cache to speed up getmodule(). Patch #1553314 ........ r51805 | ronald.oussoren | 2006-09-07 14:03:10 +0200 (Thu, 07 Sep 2006) | 2 lines Fix a glaring error and update some version numbers. ........ r51814 | andrew.kuchling | 2006-09-07 15:56:23 +0200 (Thu, 07 Sep 2006) | 1 line Typo fix ........ r51815 | andrew.kuchling | 2006-09-07 15:59:38 +0200 (Thu, 07 Sep 2006) | 8 lines [Bug #1552726] Avoid repeatedly polling in interactive mode -- only put a timeout on the select() if an input hook has been defined. Patch by Richard Boulton. This select() code is only executed with readline 2.1, or if READLINE_CALLBACKS is defined. Backport candidate for 2.5, 2.4, probably earlier versions too. ........ r51816 | armin.rigo | 2006-09-07 17:06:00 +0200 (Thu, 07 Sep 2006) | 2 lines Add a warning notice on top of the generated grammar.txt. ........ r51819 | thomas.heller | 2006-09-07 20:56:28 +0200 (Thu, 07 Sep 2006) | 5 lines Anonymous structure fields that have a bit-width specified did not work, and they gave a strange error message from PyArg_ParseTuple: function takes exactly 2 arguments (3 given). With tests. ........ r51820 | thomas.heller | 2006-09-07 21:09:54 +0200 (Thu, 07 Sep 2006) | 4 lines The cast function did not accept c_char_p or c_wchar_p instances as first argument, and failed with a 'bad argument to internal function' error message. ........ r51827 | nick.coghlan | 2006-09-08 12:04:38 +0200 (Fri, 08 Sep 2006) | 1 line Add missing NEWS entry for rev 51803 ........ r51828 | andrew.kuchling | 2006-09-08 15:25:23 +0200 (Fri, 08 Sep 2006) | 1 line Add missing word ........ r51829 | andrew.kuchling | 2006-09-08 15:35:49 +0200 (Fri, 08 Sep 2006) | 1 line Explain SQLite a bit more clearly ........ r51830 | andrew.kuchling | 2006-09-08 15:36:36 +0200 (Fri, 08 Sep 2006) | 1 line Explain SQLite a bit more clearly ........ r51832 | andrew.kuchling | 2006-09-08 16:02:45 +0200 (Fri, 08 Sep 2006) | 1 line Use native SQLite types ........ r51833 | andrew.kuchling | 2006-09-08 16:03:01 +0200 (Fri, 08 Sep 2006) | 1 line Use native SQLite types ........ r51835 | andrew.kuchling | 2006-09-08 16:05:10 +0200 (Fri, 08 Sep 2006) | 1 line Fix typo in example ........ r51837 | brett.cannon | 2006-09-09 09:11:46 +0200 (Sat, 09 Sep 2006) | 6 lines Remove the __unicode__ method from exceptions. Allows unicode() to be called on exception classes. Would require introducing a tp_unicode slot to make it work otherwise. Fixes bug #1551432 and will be backported. ........ r51854 | neal.norwitz | 2006-09-11 06:24:09 +0200 (Mon, 11 Sep 2006) | 8 lines Forward port of 51850 from release25-maint branch. As mentioned on python-dev, reverting patch #1504333 because it introduced an infinite loop in rev 47154. This patch also adds a test to prevent the regression. ........ r51855 | neal.norwitz | 2006-09-11 06:28:16 +0200 (Mon, 11 Sep 2006) | 5 lines Properly handle a NULL returned from PyArena_New(). (Also fix some whitespace) Klocwork #364. ........ r51856 | neal.norwitz | 2006-09-11 06:32:57 +0200 (Mon, 11 Sep 2006) | 1 line Add a "crasher" taken from the sgml bug report referenced in the comment ........ r51858 | georg.brandl | 2006-09-11 11:38:35 +0200 (Mon, 11 Sep 2006) | 12 lines Forward-port of rev. 51857: Building with HP's cc on HP-UX turned up a couple of problems. _PyGILState_NoteThreadState was declared as static inconsistently. Make it static as it's not necessary outside of this module. Some tests failed because errno was reset to 0. (I think the tests that failed were at least: test_fcntl and test_mailbox). Ensure that errno doesn't change after a call to Py_END_ALLOW_THREADS. This only affected debug builds. ........ r51865 | martin.v.loewis | 2006-09-12 21:49:20 +0200 (Tue, 12 Sep 2006) | 2 lines Forward-port 51862: Add sgml_input.html. ........ r51866 | andrew.kuchling | 2006-09-12 22:50:23 +0200 (Tue, 12 Sep 2006) | 1 line Markup typo fix ........ r51867 | andrew.kuchling | 2006-09-12 23:09:02 +0200 (Tue, 12 Sep 2006) | 1 line Some editing, markup fixes ........ r51868 | andrew.kuchling | 2006-09-12 23:21:51 +0200 (Tue, 12 Sep 2006) | 1 line More wordsmithing ........ r51877 | andrew.kuchling | 2006-09-14 13:22:18 +0200 (Thu, 14 Sep 2006) | 1 line Make --help mention that -v can be supplied multiple times ........ r51878 | andrew.kuchling | 2006-09-14 13:28:50 +0200 (Thu, 14 Sep 2006) | 1 line Rewrite help message to remove some of the parentheticals. (There were a lot of them.) ........ r51883 | ka-ping.yee | 2006-09-15 02:34:19 +0200 (Fri, 15 Sep 2006) | 2 lines Fix grammar errors and improve clarity. ........ r51885 | georg.brandl | 2006-09-15 07:22:24 +0200 (Fri, 15 Sep 2006) | 3 lines Correct elementtree module index entry. ........ r51889 | fred.drake | 2006-09-15 17:18:04 +0200 (Fri, 15 Sep 2006) | 4 lines - fix module name in links in formatted documentation - minor markup cleanup (forward-ported from release25-maint revision 51888) ........ r51891 | fred.drake | 2006-09-15 18:11:27 +0200 (Fri, 15 Sep 2006) | 3 lines revise explanation of returns_unicode to reflect bool values and to include the default value (merged from release25-maint revision 51890) ........ r51897 | martin.v.loewis | 2006-09-16 19:36:37 +0200 (Sat, 16 Sep 2006) | 2 lines Patch #1557515: Add RLIMIT_SBSIZE. ........ r51903 | ronald.oussoren | 2006-09-17 20:42:53 +0200 (Sun, 17 Sep 2006) | 2 lines Port of revision 51902 in release25-maint to the trunk ........ r51904 | ronald.oussoren | 2006-09-17 21:23:27 +0200 (Sun, 17 Sep 2006) | 3 lines Tweak Mac/Makefile in to ensure that pythonw gets rebuild when the major version of python changes (2.5 -> 2.6). Bug #1552935. ........ r51913 | guido.van.rossum | 2006-09-18 23:36:16 +0200 (Mon, 18 Sep 2006) | 2 lines Make this thing executable. ........ r51920 | gregory.p.smith | 2006-09-19 19:35:04 +0200 (Tue, 19 Sep 2006) | 5 lines Fixes a bug with bsddb.DB.stat where the flags and txn keyword arguments are transposed. (reported by Louis Zechtzer) ..already committed to release24-maint ..needs committing to release25-maint ........ r51926 | brett.cannon | 2006-09-20 20:34:28 +0200 (Wed, 20 Sep 2006) | 3 lines Accidentally didn't commit Misc/NEWS entry on when __unicode__() was removed from exceptions. ........ r51927 | brett.cannon | 2006-09-20 20:43:13 +0200 (Wed, 20 Sep 2006) | 6 lines Allow exceptions to be directly sliced again (e.g., ``BaseException(1,2,3)[0:2]``). Discovered in Python 2.5.0 by Thomas Heller and reported to python-dev. This should be backported to 2.5 . ........ r51928 | brett.cannon | 2006-09-20 21:28:35 +0200 (Wed, 20 Sep 2006) | 2 lines Make python.vim output more deterministic. ........ r51949 | walter.doerwald | 2006-09-21 17:09:55 +0200 (Thu, 21 Sep 2006) | 2 lines Fix typo. ........ r51950 | jack.diederich | 2006-09-21 19:50:26 +0200 (Thu, 21 Sep 2006) | 5 lines * regression bug, count_next was coercing a Py_ssize_t to an unsigned Py_size_t which breaks negative counts * added test for negative numbers will backport to 2.5.1 ........ r51953 | jack.diederich | 2006-09-21 22:34:49 +0200 (Thu, 21 Sep 2006) | 1 line added itertools.count(-n) fix ........ r51971 | neal.norwitz | 2006-09-22 10:16:26 +0200 (Fri, 22 Sep 2006) | 10 lines Fix %zd string formatting on Mac OS X so it prints negative numbers. In addition to testing positive numbers, verify negative numbers work in configure. In order to avoid compiler warnings on OS X 10.4, also change the order of the check for the format character to use (PY_FORMAT_SIZE_T) in the sprintf format for Py_ssize_t. This patch changes PY_FORMAT_SIZE_T from "" to "l" if it wasn't defined at configure time. Need to verify the buildbot results. Backport candidate (if everyone thinks this patch can't be improved). ........ r51972 | neal.norwitz | 2006-09-22 10:18:10 +0200 (Fri, 22 Sep 2006) | 7 lines Bug #1557232: fix seg fault with def f((((x)))) and def f(((x),)). These tests should be improved. Hopefully this fixes variations when flipping back and forth between fpdef and fplist. Backport candidate. ........ r51975 | neal.norwitz | 2006-09-22 10:47:23 +0200 (Fri, 22 Sep 2006) | 4 lines Mostly revert this file to the same version as before. Only force setting of PY_FORMAT_SIZE_T to "l" for Mac OSX. I don't know a better define to use. This should get rid of the warnings on other platforms and Mac too. ........ r51986 | fred.drake | 2006-09-23 02:26:31 +0200 (Sat, 23 Sep 2006) | 1 line add boilerplate "What's New" document so the docs will build ........ r51987 | neal.norwitz | 2006-09-23 06:11:38 +0200 (Sat, 23 Sep 2006) | 1 line Remove extra semi-colons reported by Johnny Lee on python-dev. Backport if anyone cares. ........ r51989 | neal.norwitz | 2006-09-23 20:11:58 +0200 (Sat, 23 Sep 2006) | 1 line SF Bug #1563963, add missing word and cleanup first sentance ........ r51990 | brett.cannon | 2006-09-23 21:53:20 +0200 (Sat, 23 Sep 2006) | 3 lines Make output on test_strptime() be more verbose in face of failure. This is in hopes that more information will help debug the failing test on HPPA Ubuntu. ........ r51991 | georg.brandl | 2006-09-24 12:36:01 +0200 (Sun, 24 Sep 2006) | 2 lines Fix webbrowser.BackgroundBrowser on Windows. ........ r51993 | georg.brandl | 2006-09-24 14:35:36 +0200 (Sun, 24 Sep 2006) | 4 lines Fix a bug in the parser's future statement handling that led to "with" not being recognized as a keyword after, e.g., this statement: from __future__ import division, with_statement ........ r51995 | georg.brandl | 2006-09-24 14:50:24 +0200 (Sun, 24 Sep 2006) | 4 lines Fix a bug in traceback.format_exception_only() that led to an error being raised when print_exc() was called without an exception set. In version 2.4, this printed "None", restored that behavior. ........ r52000 | armin.rigo | 2006-09-25 17:16:26 +0200 (Mon, 25 Sep 2006) | 2 lines Another crasher. ........ r52011 | brett.cannon | 2006-09-27 01:38:24 +0200 (Wed, 27 Sep 2006) | 2 lines Make the error message for when the time data and format do not match clearer. ........ r52014 | andrew.kuchling | 2006-09-27 18:37:30 +0200 (Wed, 27 Sep 2006) | 1 line Add news item for rev. 51815 ........ r52018 | andrew.kuchling | 2006-09-27 21:23:05 +0200 (Wed, 27 Sep 2006) | 1 line Make examples do error checking on Py_InitModule ........ r52032 | brett.cannon | 2006-09-29 00:10:14 +0200 (Fri, 29 Sep 2006) | 2 lines Very minor grammatical fix in a comment. ........ r52048 | george.yoshida | 2006-09-30 07:14:02 +0200 (Sat, 30 Sep 2006) | 4 lines SF bug #1567976 : fix typo Will backport to 2.5. ........ r52051 | gregory.p.smith | 2006-09-30 08:08:20 +0200 (Sat, 30 Sep 2006) | 2 lines wording change ........ r52053 | georg.brandl | 2006-09-30 09:24:48 +0200 (Sat, 30 Sep 2006) | 2 lines Bug #1567375: a minor logical glitch in example description. ........ r52056 | georg.brandl | 2006-09-30 09:31:57 +0200 (Sat, 30 Sep 2006) | 3 lines Bug #1565661: in webbrowser, split() the command for the default GNOME browser in case it is a command with args. ........ r52058 | georg.brandl | 2006-09-30 10:43:30 +0200 (Sat, 30 Sep 2006) | 4 lines Patch #1567691: super() and new.instancemethod() now don't accept keyword arguments any more (previously they accepted them, but didn't use them). ........ r52061 | georg.brandl | 2006-09-30 11:03:42 +0200 (Sat, 30 Sep 2006) | 3 lines Bug #1566800: make sure that EnvironmentError can be called with any number of arguments, as was the case in Python 2.4. ........ r52063 | georg.brandl | 2006-09-30 11:06:45 +0200 (Sat, 30 Sep 2006) | 2 lines Bug #1566663: remove obsolete example from datetime docs. ........ r52065 | georg.brandl | 2006-09-30 11:13:21 +0200 (Sat, 30 Sep 2006) | 3 lines Bug #1566602: correct failure of posixpath unittest when $HOME ends with a slash. ........ r52068 | georg.brandl | 2006-09-30 12:58:01 +0200 (Sat, 30 Sep 2006) | 3 lines Bug #1457823: cgi.(Sv)FormContentDict's constructor now takes keep_blank_values and strict_parsing keyword arguments. ........ r52069 | georg.brandl | 2006-09-30 13:06:47 +0200 (Sat, 30 Sep 2006) | 3 lines Bug #1560617: in pyclbr, return full module name not only for classes, but also for functions. ........ r52072 | georg.brandl | 2006-09-30 13:17:34 +0200 (Sat, 30 Sep 2006) | 3 lines Bug #1556784: allow format strings longer than 127 characters in datetime's strftime function. ........ r52075 | georg.brandl | 2006-09-30 13:22:28 +0200 (Sat, 30 Sep 2006) | 3 lines Bug #1446043: correctly raise a LookupError if an encoding name given to encodings.search_function() contains a dot. ........ r52078 | georg.brandl | 2006-09-30 14:02:57 +0200 (Sat, 30 Sep 2006) | 3 lines Bug #1546052: clarify that PyString_FromString(AndSize) copies the string pointed to by its parameter. ........ r52080 | georg.brandl | 2006-09-30 14:16:03 +0200 (Sat, 30 Sep 2006) | 3 lines Convert test_import to unittest. ........ r52083 | kurt.kaiser | 2006-10-01 23:16:45 +0200 (Sun, 01 Oct 2006) | 5 lines Some syntax errors were being caught by tokenize during the tabnanny check, resulting in obscure error messages. Do the syntax check first. Bug 1562716, 1562719 ........ r52084 | kurt.kaiser | 2006-10-01 23:54:37 +0200 (Sun, 01 Oct 2006) | 3 lines Add comment explaining that error msgs may be due to user code when running w/o subprocess. ........ r52086 | martin.v.loewis | 2006-10-02 16:55:51 +0200 (Mon, 02 Oct 2006) | 3 lines Fix test for uintptr_t. Fixes #1568842. Will backport. ........ r52089 | martin.v.loewis | 2006-10-02 17:20:37 +0200 (Mon, 02 Oct 2006) | 3 lines Guard uintptr_t test with HAVE_STDINT_H, test for stdint.h. Will backport. ........ r52100 | vinay.sajip | 2006-10-03 20:02:37 +0200 (Tue, 03 Oct 2006) | 1 line Documentation omitted the additional parameter to LogRecord.__init__ which was added in 2.5. (See SF #1569622). ........ r52101 | vinay.sajip | 2006-10-03 20:20:26 +0200 (Tue, 03 Oct 2006) | 1 line Documentation clarified to mention optional parameters. ........ r52102 | vinay.sajip | 2006-10-03 20:21:56 +0200 (Tue, 03 Oct 2006) | 1 line Modified LogRecord.__init__ to make the func parameter optional. (See SF #1569622). ........ r52121 | brett.cannon | 2006-10-03 23:58:55 +0200 (Tue, 03 Oct 2006) | 2 lines Fix minor typo in a comment. ........ r52123 | brett.cannon | 2006-10-04 01:23:14 +0200 (Wed, 04 Oct 2006) | 2 lines Convert test_imp over to unittest. ........ r52128 | barry.warsaw | 2006-10-04 04:06:36 +0200 (Wed, 04 Oct 2006) | 3 lines decode_rfc2231(): As Christian Robottom Reis points out, it makes no sense to test for parts > 3 when we use .split(..., 2). ........ r52129 | jeremy.hylton | 2006-10-04 04:24:52 +0200 (Wed, 04 Oct 2006) | 9 lines Fix for SF bug 1569998: break permitted inside try. The compiler was checking that there was something on the fblock stack, but not that there was a loop on the stack. Fixed that and added a test for the specific syntax error. Bug fix candidate. ........ r52130 | martin.v.loewis | 2006-10-04 07:47:34 +0200 (Wed, 04 Oct 2006) | 4 lines Fix integer negation and absolute value to not rely on undefined behaviour of the C compiler anymore. Will backport to 2.5 and 2.4. ........ r52135 | martin.v.loewis | 2006-10-04 11:21:20 +0200 (Wed, 04 Oct 2006) | 1 line Forward port r52134: Add uuids for 2.4.4. ........ r52137 | armin.rigo | 2006-10-04 12:23:57 +0200 (Wed, 04 Oct 2006) | 3 lines Compilation problem caused by conflicting typedefs for uint32_t (unsigned long vs. unsigned int). ........ r52139 | armin.rigo | 2006-10-04 14:17:45 +0200 (Wed, 04 Oct 2006) | 23 lines Forward-port of r52136,52138: a review of overflow-detecting code. * unified the way intobject, longobject and mystrtoul handle values around -sys.maxint-1. * in general, trying to entierely avoid overflows in any computation involving signed ints or longs is extremely involved. Fixed a few simple cases where a compiler might be too clever (but that's all guesswork). * more overflow checks against bad data in marshal.c. * 2.5 specific: fixed a number of places that were still confusing int and Py_ssize_t. Some of them could potentially have caused "real-world" breakage. * list.pop(x): fixing overflow issues on x was messy. I just reverted to PyArg_ParseTuple("n"), which does the right thing. (An obscure test was trying to give a Decimal to list.pop()... doesn't make sense any more IMHO) * trying to write a few tests... ........ r52147 | andrew.kuchling | 2006-10-04 15:42:43 +0200 (Wed, 04 Oct 2006) | 6 lines Cause a PyObject_Malloc() failure to trigger a MemoryError, and then add 'if (PyErr_Occurred())' checks to various places so that NULL is returned properly. 2.4 backport candidate. ........ r52148 | martin.v.loewis | 2006-10-04 17:25:28 +0200 (Wed, 04 Oct 2006) | 1 line Add MSVC8 project files to create wininst-8.exe. ........ r52196 | brett.cannon | 2006-10-06 00:02:31 +0200 (Fri, 06 Oct 2006) | 7 lines Clarify what "re-initialization" means for init_builtin() and init_dynamic(). Also remove warning about re-initialization as possibly raising an execption as both call _PyImport_FindExtension() which pulls any module that was already imported from the Python process' extension cache and just copies the __dict__ into the module stored in sys.modules. ........ r52200 | fred.drake | 2006-10-06 02:03:45 +0200 (Fri, 06 Oct 2006) | 3 lines - update links - remove Sleepycat name now that they have been bought ........ r52204 | andrew.kuchling | 2006-10-06 12:41:01 +0200 (Fri, 06 Oct 2006) | 1 line Case fix ........ r52208 | georg.brandl | 2006-10-06 14:46:08 +0200 (Fri, 06 Oct 2006) | 3 lines Fix name. ........ r52211 | andrew.kuchling | 2006-10-06 15:18:26 +0200 (Fri, 06 Oct 2006) | 1 line [Bug #1545341] Allow 'classifier' parameter to be a tuple as well as a list. Will backport. ........ r52212 | armin.rigo | 2006-10-06 18:33:22 +0200 (Fri, 06 Oct 2006) | 4 lines A very minor bug fix: this code looks like it is designed to accept any hue value and do the modulo itself, except it doesn't quite do it in all cases. At least, the "cannot get here" comment was wrong. ........ r52213 | andrew.kuchling | 2006-10-06 20:51:55 +0200 (Fri, 06 Oct 2006) | 1 line Comment grammar ........ r52218 | skip.montanaro | 2006-10-07 13:05:02 +0200 (Sat, 07 Oct 2006) | 6 lines Note that the excel_tab class is registered as the "excel-tab" dialect. Fixes 1572471. Make a similar change for the excel class and clean up references to the Dialects and Formatting Parameters section in a few places. ........ r52221 | georg.brandl | 2006-10-08 09:11:54 +0200 (Sun, 08 Oct 2006) | 3 lines Add missing NEWS entry for rev. 52129. ........ r52223 | hyeshik.chang | 2006-10-08 15:48:34 +0200 (Sun, 08 Oct 2006) | 3 lines Bug #1572832: fix a bug in ISO-2022 codecs which may cause segfault when encoding non-BMP unicode characters. (Submitted by Ray Chason) ........ r52227 | ronald.oussoren | 2006-10-08 19:37:58 +0200 (Sun, 08 Oct 2006) | 4 lines Add version number to the link to the python documentation in /Developer/Documentation/Python, better for users that install multiple versions of python. ........ r52229 | ronald.oussoren | 2006-10-08 19:40:02 +0200 (Sun, 08 Oct 2006) | 2 lines Fix for bug #1570284 ........ r52233 | ronald.oussoren | 2006-10-08 19:49:52 +0200 (Sun, 08 Oct 2006) | 6 lines MacOSX: distutils changes the values of BASECFLAGS and LDFLAGS when using a universal build of python on OSX 10.3 to ensure that those flags can be used to compile code (the universal build uses compiler flags that aren't supported on 10.3). This patches gives the same treatment to CFLAGS, PY_CFLAGS and BLDSHARED. ........ r52236 | ronald.oussoren | 2006-10-08 19:51:46 +0200 (Sun, 08 Oct 2006) | 5 lines MacOSX: The universal build requires that users have the MacOSX10.4u SDK installed to build extensions. This patch makes distutils emit a warning when the compiler should use an SDK but that SDK is not installed, hopefully reducing some confusion. ........ r52238 | ronald.oussoren | 2006-10-08 20:18:26 +0200 (Sun, 08 Oct 2006) | 3 lines MacOSX: add more logic to recognize the correct startup file to patch to the shell profile patching post-install script. ........ r52242 | andrew.kuchling | 2006-10-09 19:10:12 +0200 (Mon, 09 Oct 2006) | 1 line Add news item for rev. 52211 change ........ r52245 | andrew.kuchling | 2006-10-09 20:05:19 +0200 (Mon, 09 Oct 2006) | 1 line Fix wording in comment ........ r52251 | georg.brandl | 2006-10-09 21:03:06 +0200 (Mon, 09 Oct 2006) | 2 lines Patch #1572724: fix typo ('=' instead of '==') in _msi.c. ........ r52255 | barry.warsaw | 2006-10-09 21:43:24 +0200 (Mon, 09 Oct 2006) | 2 lines List gc.get_count() in the module docstring. ........ r52257 | martin.v.loewis | 2006-10-09 22:44:25 +0200 (Mon, 09 Oct 2006) | 1 line Bug #1565150: Fix subsecond processing for os.utime on Windows. ........ r52268 | ronald.oussoren | 2006-10-10 09:55:06 +0200 (Tue, 10 Oct 2006) | 2 lines MacOSX: fix permission problem in the generated installer ........ r52293 | georg.brandl | 2006-10-12 09:38:04 +0200 (Thu, 12 Oct 2006) | 2 lines Bug #1575746: fix typo in property() docs. ........ r52295 | georg.brandl | 2006-10-12 09:57:21 +0200 (Thu, 12 Oct 2006) | 3 lines Bug #813342: Start the IDLE subprocess with -Qnew if the parent is started with that option. ........ r52297 | georg.brandl | 2006-10-12 10:22:53 +0200 (Thu, 12 Oct 2006) | 2 lines Bug #1565919: document set types in the Language Reference. ........ r52299 | georg.brandl | 2006-10-12 11:20:33 +0200 (Thu, 12 Oct 2006) | 3 lines Bug #1550524: better heuristics to find correct class definition in inspect.findsource(). ........ r52301 | georg.brandl | 2006-10-12 11:47:12 +0200 (Thu, 12 Oct 2006) | 4 lines Bug #1548891: The cStringIO.StringIO() constructor now encodes unicode arguments with the system default encoding just like the write() method does, instead of converting it to a raw buffer. ........ r52303 | georg.brandl | 2006-10-12 13:14:40 +0200 (Thu, 12 Oct 2006) | 2 lines Bug #1546628: add a note about urlparse.urljoin() and absolute paths. ........ r52305 | georg.brandl | 2006-10-12 13:27:59 +0200 (Thu, 12 Oct 2006) | 3 lines Bug #1545497: when given an explicit base, int() did ignore NULs embedded in the string to convert. ........ r52307 | georg.brandl | 2006-10-12 13:41:11 +0200 (Thu, 12 Oct 2006) | 3 lines Add a note to fpectl docs that it's not built by default (bug #1556261). ........ r52309 | georg.brandl | 2006-10-12 13:46:57 +0200 (Thu, 12 Oct 2006) | 3 lines Bug #1560114: the Mac filesystem does have accurate information about the case of filenames. ........ r52311 | georg.brandl | 2006-10-12 13:59:27 +0200 (Thu, 12 Oct 2006) | 2 lines Small grammar fix, thanks Sjoerd. ........ r52313 | georg.brandl | 2006-10-12 14:03:07 +0200 (Thu, 12 Oct 2006) | 2 lines Fix tarfile depending on buggy int('1\0', base) behavior. ........ r52315 | georg.brandl | 2006-10-12 14:33:07 +0200 (Thu, 12 Oct 2006) | 2 lines Bug #1283491: follow docstring convention wrt. keyword-able args in sum(). ........ r52316 | georg.brandl | 2006-10-12 15:08:16 +0200 (Thu, 12 Oct 2006) | 3 lines Bug #1560179: speed up posixpath.(dir|base)name ........ r52327 | brett.cannon | 2006-10-14 08:36:45 +0200 (Sat, 14 Oct 2006) | 3 lines Clean up the language of a sentence relating to the connect() function and user-defined datatypes. ........ r52332 | neal.norwitz | 2006-10-14 23:33:38 +0200 (Sat, 14 Oct 2006) | 3 lines Update the peephole optimizer to remove more dead code (jumps after returns) and inline jumps to returns. ........ r52333 | martin.v.loewis | 2006-10-15 09:54:40 +0200 (Sun, 15 Oct 2006) | 4 lines Patch #1576954: Update VC6 build directory; remove redundant files in VC7. Will backport to 2.5. ........ r52335 | martin.v.loewis | 2006-10-15 10:43:33 +0200 (Sun, 15 Oct 2006) | 1 line Patch #1576166: Support os.utime for directories on Windows NT+. ........ r52336 | martin.v.loewis | 2006-10-15 10:51:22 +0200 (Sun, 15 Oct 2006) | 2 lines Patch #1577551: Add ctypes and ET build support for VC6. Will backport to 2.5. ........ r52338 | martin.v.loewis | 2006-10-15 11:35:51 +0200 (Sun, 15 Oct 2006) | 1 line Loosen the test for equal time stamps. ........ r52339 | martin.v.loewis | 2006-10-15 11:43:39 +0200 (Sun, 15 Oct 2006) | 2 lines Bug #1567666: Emulate GetFileAttributesExA for Win95. Will backport to 2.5. ........ r52341 | martin.v.loewis | 2006-10-15 13:02:07 +0200 (Sun, 15 Oct 2006) | 2 lines Round to int, because some systems support sub-second time stamps in stat, but not in utime. Also be consistent with modifying only mtime, not atime. ........ r52342 | martin.v.loewis | 2006-10-15 13:57:40 +0200 (Sun, 15 Oct 2006) | 2 lines Set the eol-style for project files to "CRLF". ........ r52343 | martin.v.loewis | 2006-10-15 13:59:56 +0200 (Sun, 15 Oct 2006) | 3 lines Drop binary property on dsp files, set eol-style to CRLF instead. ........ r52344 | martin.v.loewis | 2006-10-15 14:01:43 +0200 (Sun, 15 Oct 2006) | 2 lines Remove binary property, set eol-style to CRLF instead. ........ r52346 | martin.v.loewis | 2006-10-15 16:30:38 +0200 (Sun, 15 Oct 2006) | 2 lines Mention the bdist_msi module. Will backport to 2.5. ........ r52354 | brett.cannon | 2006-10-16 05:09:52 +0200 (Mon, 16 Oct 2006) | 3 lines Fix turtle so that you can launch the demo2 function on its own instead of only when the module is launched as a script. ........ r52356 | martin.v.loewis | 2006-10-17 17:18:06 +0200 (Tue, 17 Oct 2006) | 2 lines Patch #1457736: Update VC6 to use current PCbuild settings. Will backport to 2.5. ........ r52360 | martin.v.loewis | 2006-10-17 20:09:55 +0200 (Tue, 17 Oct 2006) | 2 lines Remove obsolete file. Will backport. ........ r52363 | martin.v.loewis | 2006-10-17 20:59:23 +0200 (Tue, 17 Oct 2006) | 4 lines Forward-port r52358: - Bug #1578513: Cross compilation was broken by a change to configure. Repair so that it's back to how it was in 2.4.3. ........ r52365 | thomas.heller | 2006-10-17 21:30:48 +0200 (Tue, 17 Oct 2006) | 6 lines ctypes callback functions only support 'fundamental' result types. Check this and raise an error when something else is used - before this change ctypes would hang or crash when such a callback was called. This is a partial fix for #1574584. Will backport to release25-maint. ........ r52377 | tim.peters | 2006-10-18 07:06:06 +0200 (Wed, 18 Oct 2006) | 2 lines newIobject(): repaired incorrect cast to quiet MSVC warning. ........ r52378 | tim.peters | 2006-10-18 07:09:12 +0200 (Wed, 18 Oct 2006) | 2 lines Whitespace normalization. ........ r52379 | tim.peters | 2006-10-18 07:10:28 +0200 (Wed, 18 Oct 2006) | 2 lines Add missing svn:eol-style to text files. ........ r52387 | martin.v.loewis | 2006-10-19 12:58:46 +0200 (Thu, 19 Oct 2006) | 3 lines Add check for the PyArg_ParseTuple format, and declare it if it is supported. ........ r52388 | martin.v.loewis | 2006-10-19 13:00:37 +0200 (Thu, 19 Oct 2006) | 3 lines Fix various minor errors in passing arguments to PyArg_ParseTuple. ........ r52389 | martin.v.loewis | 2006-10-19 18:01:37 +0200 (Thu, 19 Oct 2006) | 2 lines Restore CFLAGS after checking for __attribute__ ........ r52390 | andrew.kuchling | 2006-10-19 23:55:55 +0200 (Thu, 19 Oct 2006) | 1 line [Bug #1576348] Fix typo in example ........ r52414 | walter.doerwald | 2006-10-22 10:59:41 +0200 (Sun, 22 Oct 2006) | 2 lines Port test___future__ to unittest. ........ r52415 | ronald.oussoren | 2006-10-22 12:45:18 +0200 (Sun, 22 Oct 2006) | 3 lines Patch #1580674: with this patch os.readlink uses the filesystem encoding to decode unicode objects and returns an unicode object when the argument is one. ........ r52416 | martin.v.loewis | 2006-10-22 12:46:18 +0200 (Sun, 22 Oct 2006) | 3 lines Patch #1580872: Remove duplicate declaration of PyCallable_Check. Will backport to 2.5. ........ r52418 | martin.v.loewis | 2006-10-22 12:55:15 +0200 (Sun, 22 Oct 2006) | 4 lines - Patch #1560695: Add .note.GNU-stack to ctypes' sysv.S so that ctypes isn't considered as requiring executable stacks. Will backport to 2.5. ........ r52420 | martin.v.loewis | 2006-10-22 15:45:13 +0200 (Sun, 22 Oct 2006) | 3 lines Remove passwd.adjunct.byname from list of maps for test_nis. Will backport to 2.5. ........ r52431 | georg.brandl | 2006-10-24 18:54:16 +0200 (Tue, 24 Oct 2006) | 2 lines Patch [ 1583506 ] tarfile.py: 100-char filenames are truncated ........ r52446 | andrew.kuchling | 2006-10-26 21:10:46 +0200 (Thu, 26 Oct 2006) | 1 line [Bug #1579796] Wrong syntax for PyDateTime_IMPORT in documentation. Reported by David Faure. ........ r52449 | andrew.kuchling | 2006-10-26 21:16:46 +0200 (Thu, 26 Oct 2006) | 1 line Typo fix ........ r52452 | martin.v.loewis | 2006-10-27 08:16:31 +0200 (Fri, 27 Oct 2006) | 3 lines Patch #1549049: Rewrite type conversion in structmember. Fixes #1545696 and #1566140. Will backport to 2.5. ........ r52454 | martin.v.loewis | 2006-10-27 08:42:27 +0200 (Fri, 27 Oct 2006) | 2 lines Check for values.h. Will backport. ........ r52456 | martin.v.loewis | 2006-10-27 09:06:52 +0200 (Fri, 27 Oct 2006) | 2 lines Get DBL_MAX from float.h not values.h. Will backport. ........ r52458 | martin.v.loewis | 2006-10-27 09:13:28 +0200 (Fri, 27 Oct 2006) | 2 lines Patch #1567274: Support SMTP over TLS. ........ r52459 | andrew.kuchling | 2006-10-27 13:33:29 +0200 (Fri, 27 Oct 2006) | 1 line Set svn:keywords property ........ r52460 | andrew.kuchling | 2006-10-27 13:36:41 +0200 (Fri, 27 Oct 2006) | 1 line Add item ........ r52461 | andrew.kuchling | 2006-10-27 13:37:01 +0200 (Fri, 27 Oct 2006) | 1 line Some wording changes and markup fixes ........ r52462 | andrew.kuchling | 2006-10-27 14:18:38 +0200 (Fri, 27 Oct 2006) | 1 line [Bug #1585690] Note that line_num was added in Python 2.5 ........ r52464 | andrew.kuchling | 2006-10-27 14:50:38 +0200 (Fri, 27 Oct 2006) | 1 line [Bug #1583946] Reword description of server and issuer ........ r52466 | andrew.kuchling | 2006-10-27 15:06:25 +0200 (Fri, 27 Oct 2006) | 1 line [Bug #1562583] Mention the set_reuse_addr() method ........ r52469 | andrew.kuchling | 2006-10-27 15:22:46 +0200 (Fri, 27 Oct 2006) | 4 lines [Bug #1542016] Report PCALL_POP value. This makes the return value of sys.callstats() match its docstring. Backport candidate. Though it's an API change, this is a pretty obscure portion of the API. ........ r52473 | andrew.kuchling | 2006-10-27 16:53:41 +0200 (Fri, 27 Oct 2006) | 1 line Point users to the subprocess module in the docs for os.system, os.spawn*, os.popen2, and the popen2 and commands modules ........ r52476 | andrew.kuchling | 2006-10-27 18:39:10 +0200 (Fri, 27 Oct 2006) | 1 line [Bug #1576241] Let functools.wraps work with built-in functions ........ r52478 | andrew.kuchling | 2006-10-27 18:55:34 +0200 (Fri, 27 Oct 2006) | 1 line [Bug #1575506] The _singlefileMailbox class was using the wrong file object in its flush() method, causing an error ........ r52480 | andrew.kuchling | 2006-10-27 19:06:16 +0200 (Fri, 27 Oct 2006) | 1 line Clarify docstring ........ r52481 | andrew.kuchling | 2006-10-27 19:11:23 +0200 (Fri, 27 Oct 2006) | 5 lines [Patch #1574068 by Scott Dial] urllib and urllib2 were using base64.encodestring() for encoding authentication data. encodestring() can include newlines for very long input, which produced broken HTTP headers. ........ r52483 | andrew.kuchling | 2006-10-27 20:13:46 +0200 (Fri, 27 Oct 2006) | 1 line Check db_setup_debug for a few print statements; change sqlite_setup_debug to False ........ r52484 | andrew.kuchling | 2006-10-27 20:15:02 +0200 (Fri, 27 Oct 2006) | 1 line [Patch #1503717] Tiny patch from Chris AtLee to stop a lengthy line from being printed ........ r52485 | thomas.heller | 2006-10-27 20:31:36 +0200 (Fri, 27 Oct 2006) | 5 lines WindowsError.str should display the windows error code, not the posix error code; with test. Fixes #1576174. Will backport to release25-maint. ........ r52487 | thomas.heller | 2006-10-27 21:05:53 +0200 (Fri, 27 Oct 2006) | 4 lines Modulefinder now handles absolute and relative imports, including tests. Will backport to release25-maint. ........ r52488 | georg.brandl | 2006-10-27 22:39:43 +0200 (Fri, 27 Oct 2006) | 2 lines Patch #1552024: add decorator support to unparse.py demo script. ........ r52492 | walter.doerwald | 2006-10-28 12:47:12 +0200 (Sat, 28 Oct 2006) | 2 lines Port test_bufio to unittest. ........ r52493 | georg.brandl | 2006-10-28 15:10:17 +0200 (Sat, 28 Oct 2006) | 6 lines Convert test_global, test_scope and test_grammar to unittest. I tried to enclose all tests which must be run at the toplevel (instead of inside a method) in exec statements. ........ r52494 | georg.brandl | 2006-10-28 15:11:41 +0200 (Sat, 28 Oct 2006) | 3 lines Update outstanding bugs test file. ........ r52495 | georg.brandl | 2006-10-28 15:51:49 +0200 (Sat, 28 Oct 2006) | 3 lines Convert test_math to unittest. ........ r52496 | georg.brandl | 2006-10-28 15:56:58 +0200 (Sat, 28 Oct 2006) | 3 lines Convert test_opcodes to unittest. ........ r52497 | georg.brandl | 2006-10-28 18:04:04 +0200 (Sat, 28 Oct 2006) | 2 lines Fix nth() itertool recipe. ........ r52500 | georg.brandl | 2006-10-28 22:25:09 +0200 (Sat, 28 Oct 2006) | 2 lines make test_grammar pass with python -O ........ r52501 | neal.norwitz | 2006-10-28 23:15:30 +0200 (Sat, 28 Oct 2006) | 6 lines Add some asserts. In sysmodule, I think these were to try to silence some warnings from Klokwork. They verify the assumptions of the format of svn version output. The assert in the thread module helped debug a problem on HP-UX. ........ r52502 | neal.norwitz | 2006-10-28 23:16:54 +0200 (Sat, 28 Oct 2006) | 5 lines Fix warnings with HP's C compiler. It doesn't recognize that infinite loops are, um, infinite. These conditions should not be able to happen. Will backport. ........ r52503 | neal.norwitz | 2006-10-28 23:17:51 +0200 (Sat, 28 Oct 2006) | 5 lines Fix crash in test on HP-UX. Apparently, it's not possible to delete a lock if it's held (even by the current thread). Will backport. ........ r52504 | neal.norwitz | 2006-10-28 23:19:07 +0200 (Sat, 28 Oct 2006) | 6 lines Fix bug #1565514, SystemError not raised on too many nested blocks. It seems like this should be a different error than SystemError, but I don't have any great ideas and SystemError was raised in 2.4 and earlier. Will backport. ........ r52505 | neal.norwitz | 2006-10-28 23:20:12 +0200 (Sat, 28 Oct 2006) | 4 lines Prevent crash if alloc of garbage fails. Found by Typo.pl. Will backport. ........ r52506 | neal.norwitz | 2006-10-28 23:21:00 +0200 (Sat, 28 Oct 2006) | 4 lines Don't inline Py_ADDRESS_IN_RANGE with gcc 4+ either. Will backport. ........ r52513 | neal.norwitz | 2006-10-28 23:56:49 +0200 (Sat, 28 Oct 2006) | 2 lines Fix test_modulefinder so it doesn't fail when run after test_distutils. ........ r52514 | neal.norwitz | 2006-10-29 00:12:26 +0200 (Sun, 29 Oct 2006) | 4 lines From SF 1557890, fix problem of using wrong type in example. Will backport. ........ r52517 | georg.brandl | 2006-10-29 09:39:22 +0100 (Sun, 29 Oct 2006) | 4 lines Fix codecs.EncodedFile which did not use file_encoding in 2.5.0, and fix all codecs file wrappers to work correctly with the "with" statement (bug #1586513). ........ r52519 | georg.brandl | 2006-10-29 09:47:08 +0100 (Sun, 29 Oct 2006) | 3 lines Clean up a leftover from old listcomp generation code. ........ r52520 | georg.brandl | 2006-10-29 09:53:06 +0100 (Sun, 29 Oct 2006) | 4 lines Bug #1586448: the compiler module now emits the same bytecode for list comprehensions as the builtin compiler, using the LIST_APPEND opcode. ........ r52521 | georg.brandl | 2006-10-29 10:01:01 +0100 (Sun, 29 Oct 2006) | 3 lines Remove trailing comma. ........ r52522 | georg.brandl | 2006-10-29 10:05:04 +0100 (Sun, 29 Oct 2006) | 3 lines Bug #1357915: allow all sequence types for shell arguments in subprocess. ........ r52524 | georg.brandl | 2006-10-29 10:16:12 +0100 (Sun, 29 Oct 2006) | 3 lines Patch #1583880: fix tarfile's problems with long names and posix/ GNU modes. ........ r52526 | georg.brandl | 2006-10-29 10:18:00 +0100 (Sun, 29 Oct 2006) | 3 lines Test assert if __debug__ is true. ........ r52527 | georg.brandl | 2006-10-29 10:32:16 +0100 (Sun, 29 Oct 2006) | 2 lines Fix the new EncodedFile test to work with big endian platforms. ........ r52529 | georg.brandl | 2006-10-29 15:39:09 +0100 (Sun, 29 Oct 2006) | 2 lines Bug #1586613: fix zlib and bz2 codecs' incremental en/decoders. ........ r52532 | georg.brandl | 2006-10-29 19:01:08 +0100 (Sun, 29 Oct 2006) | 2 lines Bug #1586773: extend hashlib docstring. ........ r52534 | neal.norwitz | 2006-10-29 19:30:10 +0100 (Sun, 29 Oct 2006) | 4 lines Update comments, remove commented out code. Move assembler structure next to assembler code to make it easier to move it to a separate file. ........ r52535 | georg.brandl | 2006-10-29 19:31:42 +0100 (Sun, 29 Oct 2006) | 3 lines Bug #1576657: when setting a KeyError for a tuple key, make sure that the tuple isn't used as the "exception arguments tuple". ........ r52537 | georg.brandl | 2006-10-29 20:13:40 +0100 (Sun, 29 Oct 2006) | 3 lines Convert test_mmap to unittest. ........ r52538 | georg.brandl | 2006-10-29 20:20:45 +0100 (Sun, 29 Oct 2006) | 3 lines Convert test_poll to unittest. ........ r52539 | georg.brandl | 2006-10-29 20:24:43 +0100 (Sun, 29 Oct 2006) | 3 lines Convert test_nis to unittest. ........ r52540 | georg.brandl | 2006-10-29 20:35:03 +0100 (Sun, 29 Oct 2006) | 3 lines Convert test_types to unittest. ........ r52541 | georg.brandl | 2006-10-29 20:51:16 +0100 (Sun, 29 Oct 2006) | 3 lines Convert test_cookie to unittest. ........ r52542 | georg.brandl | 2006-10-29 21:09:12 +0100 (Sun, 29 Oct 2006) | 3 lines Convert test_cgi to unittest. ........ r52543 | georg.brandl | 2006-10-29 21:24:01 +0100 (Sun, 29 Oct 2006) | 3 lines Completely convert test_httplib to unittest. ........ r52544 | georg.brandl | 2006-10-29 21:28:26 +0100 (Sun, 29 Oct 2006) | 2 lines Convert test_MimeWriter to unittest. ........ r52545 | georg.brandl | 2006-10-29 21:31:17 +0100 (Sun, 29 Oct 2006) | 3 lines Convert test_openpty to unittest. ........ r52546 | georg.brandl | 2006-10-29 21:35:12 +0100 (Sun, 29 Oct 2006) | 3 lines Remove leftover test output file. ........ r52547 | georg.brandl | 2006-10-29 22:54:18 +0100 (Sun, 29 Oct 2006) | 3 lines Move the check for openpty to the beginning. ........ r52548 | walter.doerwald | 2006-10-29 23:06:28 +0100 (Sun, 29 Oct 2006) | 2 lines Add tests for basic argument errors. ........ r52549 | walter.doerwald | 2006-10-30 00:02:27 +0100 (Mon, 30 Oct 2006) | 3 lines Add tests for incremental codecs with an errors argument. ........ r52550 | neal.norwitz | 2006-10-30 00:39:03 +0100 (Mon, 30 Oct 2006) | 1 line Fix refleak ........ r52552 | neal.norwitz | 2006-10-30 00:58:36 +0100 (Mon, 30 Oct 2006) | 1 line I'm assuming this is correct, it fixes the tests so they pass again ........ r52555 | vinay.sajip | 2006-10-31 18:32:37 +0100 (Tue, 31 Oct 2006) | 1 line Change to improve speed of _fixupChildren ........ r52556 | vinay.sajip | 2006-10-31 18:34:31 +0100 (Tue, 31 Oct 2006) | 1 line Added relativeCreated to Formatter doc (has been in the system for a long time - was unaccountably left out of the docs and not noticed until now). ........ r52588 | thomas.heller | 2006-11-02 20:48:24 +0100 (Thu, 02 Nov 2006) | 5 lines Replace the XXX marker in the 'Arrays and pointers' reference manual section with a link to the tutorial sections. Will backport to release25-maint. ........ r52592 | thomas.heller | 2006-11-02 21:22:29 +0100 (Thu, 02 Nov 2006) | 6 lines Fix a code example by adding a missing import. Fixes #1557890. Will backport to release25-maint. ........ r52598 | tim.peters | 2006-11-03 03:32:46 +0100 (Fri, 03 Nov 2006) | 2 lines Whitespace normalization. ........ r52619 | martin.v.loewis | 2006-11-04 19:14:06 +0100 (Sat, 04 Nov 2006) | 4 lines - Patch #1060577: Extract list of RPM files from spec file in bdist_rpm Will backport to 2.5. ........ r52621 | neal.norwitz | 2006-11-04 20:25:22 +0100 (Sat, 04 Nov 2006) | 4 lines Bug #1588287: fix invalid assertion for `1,2` in debug builds. Will backport ........ r52630 | andrew.kuchling | 2006-11-05 22:04:37 +0100 (Sun, 05 Nov 2006) | 1 line Update link ........ r52631 | skip.montanaro | 2006-11-06 15:34:52 +0100 (Mon, 06 Nov 2006) | 1 line note that user can control directory location even if default dir is used ........ r52644 | ronald.oussoren | 2006-11-07 16:53:38 +0100 (Tue, 07 Nov 2006) | 2 lines Fix a number of typos in strings and comments (sf#1589070) ........ r52647 | ronald.oussoren | 2006-11-07 17:00:34 +0100 (Tue, 07 Nov 2006) | 2 lines Whitespace changes to make the source more compliant with PEP8 (SF#1589070) ........ r52651 | thomas.heller | 2006-11-07 19:01:18 +0100 (Tue, 07 Nov 2006) | 3 lines Fix markup. Will backport to release25-maint. ........ r52653 | thomas.heller | 2006-11-07 19:20:47 +0100 (Tue, 07 Nov 2006) | 3 lines Fix grammatical error as well. Will backport to release25-maint. ........ r52657 | andrew.kuchling | 2006-11-07 21:39:16 +0100 (Tue, 07 Nov 2006) | 1 line Add missing word ........ r52662 | martin.v.loewis | 2006-11-08 07:46:37 +0100 (Wed, 08 Nov 2006) | 4 lines Correctly forward exception in instance_contains(). Fixes #1591996. Patch contributed by Neal Norwitz. Will backport. ........ r52664 | martin.v.loewis | 2006-11-08 07:48:36 +0100 (Wed, 08 Nov 2006) | 2 lines News entry for 52662. ........ r52665 | martin.v.loewis | 2006-11-08 08:35:55 +0100 (Wed, 08 Nov 2006) | 2 lines Patch #1351744: Add askyesnocancel helper for tkMessageBox. ........ r52666 | georg.brandl | 2006-11-08 08:45:59 +0100 (Wed, 08 Nov 2006) | 2 lines Patch #1592072: fix docs for return value of PyErr_CheckSignals. ........ r52668 | georg.brandl | 2006-11-08 11:04:29 +0100 (Wed, 08 Nov 2006) | 3 lines Bug #1592533: rename variable in heapq doc example, to avoid shadowing "sorted". ........ r52671 | andrew.kuchling | 2006-11-08 14:35:34 +0100 (Wed, 08 Nov 2006) | 1 line Add section on the functional module ........ r52672 | andrew.kuchling | 2006-11-08 15:14:30 +0100 (Wed, 08 Nov 2006) | 1 line Add section on operator module; make a few edits ........ r52673 | andrew.kuchling | 2006-11-08 15:24:03 +0100 (Wed, 08 Nov 2006) | 1 line Add table of contents; this required fixing a few headings. Some more smalle edits. ........ r52674 | andrew.kuchling | 2006-11-08 15:30:14 +0100 (Wed, 08 Nov 2006) | 1 line More edits ........ r52686 | martin.v.loewis | 2006-11-09 12:06:03 +0100 (Thu, 09 Nov 2006) | 3 lines Patch #838546: Make terminal become controlling in pty.fork(). Will backport to 2.5. ........ r52688 | martin.v.loewis | 2006-11-09 12:27:32 +0100 (Thu, 09 Nov 2006) | 2 lines Patch #1592250: Add elidge argument to Tkinter.Text.search. ........ r52690 | andrew.kuchling | 2006-11-09 14:27:07 +0100 (Thu, 09 Nov 2006) | 7 lines [Bug #1569790] mailbox.Maildir.get_folder() loses factory information Both the Maildir and MH classes had this bug; the patch fixes both classes and adds a test. Will backport to 25-maint. ........ r52692 | andrew.kuchling | 2006-11-09 14:51:14 +0100 (Thu, 09 Nov 2006) | 1 line [Patch #1514544 by David Watson] use fsync() to ensure data is really on disk ........ r52695 | walter.doerwald | 2006-11-09 17:23:26 +0100 (Thu, 09 Nov 2006) | 2 lines Replace C++ comment with C comment (fixes SF bug #1593525). ........ r52712 | andrew.kuchling | 2006-11-09 22:16:46 +0100 (Thu, 09 Nov 2006) | 11 lines [Patch #1514543] mailbox (Maildir): avoid losing messages on name clash Two changes: Where possible, use link()/remove() to move files into a directory; this makes it easier to avoid overwriting an existing file. Use _create_carefully() to create files in tmp/, which uses O_EXCL. Backport candidate. ........ r52716 | phillip.eby | 2006-11-10 01:33:36 +0100 (Fri, 10 Nov 2006) | 4 lines Fix SF#1566719: not creating site-packages (or other target directory) when installing .egg-info for a project that contains no modules or packages, while using --root (as in bdist_rpm). ........ r52719 | andrew.kuchling | 2006-11-10 14:14:01 +0100 (Fri, 10 Nov 2006) | 1 line Reword entry ........ r52725 | andrew.kuchling | 2006-11-10 15:39:01 +0100 (Fri, 10 Nov 2006) | 1 line [Feature request #1542920] Link to wsgi.org ........ r52731 | georg.brandl | 2006-11-11 19:29:11 +0100 (Sat, 11 Nov 2006) | 2 lines Bug #1594742: wrong word in stringobject doc. ........ r52733 | georg.brandl | 2006-11-11 19:32:47 +0100 (Sat, 11 Nov 2006) | 2 lines Bug #1594758: wording improvement for dict.update() docs. ........ r52736 | martin.v.loewis | 2006-11-12 11:32:47 +0100 (Sun, 12 Nov 2006) | 3 lines Patch #1065257: Support passing open files as body in HTTPConnection.request(). ........ r52737 | martin.v.loewis | 2006-11-12 11:41:39 +0100 (Sun, 12 Nov 2006) | 2 lines Patch #1355023: support whence argument for GzipFile.seek. ........ r52738 | martin.v.loewis | 2006-11-12 19:24:26 +0100 (Sun, 12 Nov 2006) | 2 lines Bug #1067760: Deprecate passing floats to file.seek. ........ r52739 | martin.v.loewis | 2006-11-12 19:48:13 +0100 (Sun, 12 Nov 2006) | 3 lines Patch #1359217: Ignore 2xx response before 150 response. Will backport to 2.5. ........ r52741 | martin.v.loewis | 2006-11-12 19:56:03 +0100 (Sun, 12 Nov 2006) | 4 lines Patch #1360200: Use unmangled_version RPM spec field to deal with file name mangling. Will backport to 2.5. ........ r52753 | walter.doerwald | 2006-11-15 17:23:46 +0100 (Wed, 15 Nov 2006) | 2 lines Fix typo. ........ r52754 | georg.brandl | 2006-11-15 18:42:03 +0100 (Wed, 15 Nov 2006) | 2 lines Bug #1594809: add a note to README regarding PYTHONPATH and make install. ........ r52762 | georg.brandl | 2006-11-16 16:05:14 +0100 (Thu, 16 Nov 2006) | 2 lines Bug #1597576: mention that the new base64 api has been introduced in py2.4. ........ r52764 | georg.brandl | 2006-11-16 17:50:59 +0100 (Thu, 16 Nov 2006) | 3 lines Bug #1597824: return the registered function from atexit.register() to facilitate usage as a decorator. ........ r52765 | georg.brandl | 2006-11-16 18:08:45 +0100 (Thu, 16 Nov 2006) | 4 lines Bug #1588217: don't parse "= " as a soft line break in binascii's a2b_qp() function, instead leave it in the string as quopri.decode() does. ........ r52776 | andrew.kuchling | 2006-11-17 14:30:25 +0100 (Fri, 17 Nov 2006) | 17 lines Remove file-locking in MH.pack() method. This change looks massive but it's mostly a re-indenting after removing some try...finally blocks. Also adds a test case that does a pack() while the mailbox is locked; this test would have turned up bugs in the original code on some platforms. In both nmh and GNU Mailutils' implementation of MH-format mailboxes, no locking is done of individual message files when renaming them. The original mailbox.py code did do locking, which meant that message files had to be opened. This code was buggy on certain platforms (found through reading the code); there were code paths that closed the file object and then called _unlock_file() on it. Will backport to 25-maint once I see how the buildbots react to this patch. ........ r52780 | martin.v.loewis | 2006-11-18 19:00:23 +0100 (Sat, 18 Nov 2006) | 5 lines Patch #1538878: Don't make tkSimpleDialog dialogs transient if the parent window is withdrawn. This mirrors what dialog.tcl does. Will backport to 2.5. ........ r52782 | martin.v.loewis | 2006-11-18 19:05:35 +0100 (Sat, 18 Nov 2006) | 4 lines Patch #1594554: Always close a tkSimpleDialog on ok(), even if an exception occurs. Will backport to 2.5. ........ r52784 | martin.v.loewis | 2006-11-18 19:42:11 +0100 (Sat, 18 Nov 2006) | 3 lines Patch #1472877: Fix Tix subwidget name resolution. Will backport to 2.5. ........ r52786 | andrew.kuchling | 2006-11-18 23:17:33 +0100 (Sat, 18 Nov 2006) | 1 line Expand checking in test_sha ........ r52787 | georg.brandl | 2006-11-19 09:48:30 +0100 (Sun, 19 Nov 2006) | 3 lines Patch [ 1586791 ] better error msgs for some TypeErrors ........ r52788 | martin.v.loewis | 2006-11-19 11:41:41 +0100 (Sun, 19 Nov 2006) | 4 lines Make cStringIO.truncate raise IOError for negative arguments (even for -1). Fixes the last bit of #1359365. ........ r52789 | andrew.kuchling | 2006-11-19 19:40:01 +0100 (Sun, 19 Nov 2006) | 1 line Add a test case of data w/ bytes > 127 ........ r52790 | martin.v.loewis | 2006-11-19 19:51:54 +0100 (Sun, 19 Nov 2006) | 3 lines Patch #1070046: Marshal new-style objects like InstanceType in xmlrpclib. ........ r52792 | neal.norwitz | 2006-11-19 22:26:53 +0100 (Sun, 19 Nov 2006) | 4 lines Speed up function calls into the math module by using METH_O. There should be no functional changes. However, the error msgs are slightly different. Also verified that the module dict is not NULL on init. ........ r52794 | george.yoshida | 2006-11-20 03:24:48 +0100 (Mon, 20 Nov 2006) | 2 lines markup fix ........ r52795 | georg.brandl | 2006-11-20 08:12:58 +0100 (Mon, 20 Nov 2006) | 3 lines Further markup fix. ........ r52800 | andrew.kuchling | 2006-11-20 14:39:37 +0100 (Mon, 20 Nov 2006) | 2 lines Jython compatibility fix: if uu.decode() opened its output file, be sure to close it. ........ r52811 | neal.norwitz | 2006-11-21 06:26:22 +0100 (Tue, 21 Nov 2006) | 9 lines Bug #1599782: Fix segfault on bsddb.db.DB().type(). The problem is that _DB_get_type() can't be called without the GIL because it calls a bunch of PyErr_* APIs when an error occurs. There were no other cases in this file that it was called without the GIL. Removing the BEGIN/END THREAD around _DB_get_type() made everything work. Will backport. ........ r52814 | neal.norwitz | 2006-11-21 06:51:51 +0100 (Tue, 21 Nov 2006) | 1 line Oops, convert tabs to spaces ........ r52815 | neal.norwitz | 2006-11-21 07:23:44 +0100 (Tue, 21 Nov 2006) | 1 line Fix SF #1599879, socket.gethostname should ref getfqdn directly. ........ r52817 | martin.v.loewis | 2006-11-21 19:20:25 +0100 (Tue, 21 Nov 2006) | 4 lines Conditionalize definition of _CRT_SECURE_NO_DEPRECATE and _CRT_NONSTDC_NO_DEPRECATE. Will backport. ........ r52821 | martin.v.loewis | 2006-11-22 09:50:02 +0100 (Wed, 22 Nov 2006) | 4 lines Patch #1362975: Rework CodeContext indentation algorithm to avoid hard-coding pixel widths. Also make the text's scrollbar a child of the text frame, not the top widget. ........ r52826 | walter.doerwald | 2006-11-23 06:03:56 +0100 (Thu, 23 Nov 2006) | 3 lines Change decode() so that it works with a buffer (i.e. unicode(..., 'utf-8-sig')) SF bug #1601501. ........ r52833 | georg.brandl | 2006-11-23 10:55:07 +0100 (Thu, 23 Nov 2006) | 2 lines Bug #1601630: little improvement to getopt docs ........ r52835 | michael.hudson | 2006-11-23 14:54:04 +0100 (Thu, 23 Nov 2006) | 3 lines a test for an error condition not covered by existing tests (noticed this when writing the equivalent code for pypy) ........ r52839 | raymond.hettinger | 2006-11-23 22:06:03 +0100 (Thu, 23 Nov 2006) | 1 line Fix and/add typo ........ r52840 | raymond.hettinger | 2006-11-23 22:35:19 +0100 (Thu, 23 Nov 2006) | 1 line ... and the number of the counting shall be three. ........ r52841 | thomas.heller | 2006-11-24 19:45:39 +0100 (Fri, 24 Nov 2006) | 1 line Fix bug #1598620: A ctypes structure cannot contain itself. ........ r52843 | martin.v.loewis | 2006-11-25 16:39:19 +0100 (Sat, 25 Nov 2006) | 3 lines Disable _XOPEN_SOURCE on NetBSD 1.x. Will backport to 2.5 ........ r52845 | georg.brandl | 2006-11-26 20:27:47 +0100 (Sun, 26 Nov 2006) | 2 lines Bug #1603321: make pstats.Stats accept Unicode file paths. ........ r52850 | georg.brandl | 2006-11-27 19:46:21 +0100 (Mon, 27 Nov 2006) | 2 lines Bug #1603789: grammatical error in Tkinter docs. ........ r52855 | thomas.heller | 2006-11-28 21:21:54 +0100 (Tue, 28 Nov 2006) | 7 lines Fix #1563807: _ctypes built on AIX fails with ld ffi error. The contents of ffi_darwin.c must be compiled unless __APPLE__ is defined and __ppc__ is not. Will backport. ........ r52862 | armin.rigo | 2006-11-29 22:59:22 +0100 (Wed, 29 Nov 2006) | 3 lines Forgot a case where the locals can now be a general mapping instead of just a dictionary. (backporting...) ........ r52872 | guido.van.rossum | 2006-11-30 20:23:13 +0100 (Thu, 30 Nov 2006) | 2 lines Update version. ........ r52890 | walter.doerwald | 2006-12-01 17:59:47 +0100 (Fri, 01 Dec 2006) | 3 lines Move xdrlib tests from the module into a separate test script, port the tests to unittest and add a few new tests. ........ r52900 | raymond.hettinger | 2006-12-02 03:00:39 +0100 (Sat, 02 Dec 2006) | 1 line Add name to credits (for untokenize). ........ r52905 | martin.v.loewis | 2006-12-03 10:54:46 +0100 (Sun, 03 Dec 2006) | 2 lines Move IDLE news into NEWS.txt. ........ r52906 | martin.v.loewis | 2006-12-03 12:23:45 +0100 (Sun, 03 Dec 2006) | 4 lines Patch #1544279: Improve thread-safety of the socket module by moving the sock_addr_t storage out of the socket object. Will backport to 2.5. ........ r52908 | martin.v.loewis | 2006-12-03 13:01:53 +0100 (Sun, 03 Dec 2006) | 3 lines Patch #1371075: Make ConfigParser accept optional dict type for ordering, sorting, etc. ........ r52910 | matthias.klose | 2006-12-03 18:16:41 +0100 (Sun, 03 Dec 2006) | 2 lines - Fix build failure on kfreebsd and on the hurd. ........ r52915 | george.yoshida | 2006-12-04 12:41:54 +0100 (Mon, 04 Dec 2006) | 2 lines fix a versionchanged tag ........ r52917 | george.yoshida | 2006-12-05 06:39:50 +0100 (Tue, 05 Dec 2006) | 3 lines Fix pickle doc typo Patch #1608758 ........ r52938 | georg.brandl | 2006-12-06 23:21:18 +0100 (Wed, 06 Dec 2006) | 2 lines Patch #1610437: fix a tarfile bug with long filename headers. ........ r52945 | brett.cannon | 2006-12-07 00:38:48 +0100 (Thu, 07 Dec 2006) | 3 lines Fix a bad assumption that all objects assigned to '__loader__' on a module will have a '_files' attribute. ........ r52951 | georg.brandl | 2006-12-07 10:30:06 +0100 (Thu, 07 Dec 2006) | 3 lines RFE #1592899: mention string.maketrans() in docs for str.translate, remove reference to the old regex module in the former's doc. ........ r52962 | raymond.hettinger | 2006-12-08 04:17:18 +0100 (Fri, 08 Dec 2006) | 1 line Eliminate two redundant calls to PyObject_Hash(). ........ r52963 | raymond.hettinger | 2006-12-08 05:24:33 +0100 (Fri, 08 Dec 2006) | 3 lines Port Armin's fix for a dict resize vulnerability (svn revision 46589, sf bug 1456209). ........ r52964 | raymond.hettinger | 2006-12-08 05:57:50 +0100 (Fri, 08 Dec 2006) | 4 lines Port Georg's dictobject.c fix keys that were tuples got unpacked on the way to setting a KeyError (svn revision 52535, sf bug 1576657). ........ r52966 | raymond.hettinger | 2006-12-08 18:35:25 +0100 (Fri, 08 Dec 2006) | 2 lines Add test for SF bug 1576657 ........ r52970 | georg.brandl | 2006-12-08 21:46:11 +0100 (Fri, 08 Dec 2006) | 3 lines #1577756: svnversion doesn't react to LANG=C, use LC_ALL=C to force English output. ........ r52972 | georg.brandl | 2006-12-09 10:08:29 +0100 (Sat, 09 Dec 2006) | 3 lines Patch #1608267: fix a race condition in os.makedirs() is the directory to be created is already there. ........ r52975 | matthias.klose | 2006-12-09 13:15:27 +0100 (Sat, 09 Dec 2006) | 2 lines - Fix the build of the library reference in info format. ........ r52994 | neal.norwitz | 2006-12-11 02:01:06 +0100 (Mon, 11 Dec 2006) | 1 line Fix a typo ........ r52996 | georg.brandl | 2006-12-11 08:56:33 +0100 (Mon, 11 Dec 2006) | 2 lines Move errno imports back to individual functions. ........ r52998 | vinay.sajip | 2006-12-11 15:07:16 +0100 (Mon, 11 Dec 2006) | 1 line Patch by Jeremy Katz (SF #1609407) ........ r53000 | vinay.sajip | 2006-12-11 15:26:23 +0100 (Mon, 11 Dec 2006) | 1 line Patch by "cuppatea" (SF #1503765) ........
1746 lines
57 KiB
C
1746 lines
57 KiB
C
#include "Python.h"
|
|
|
|
#ifdef WITH_PYMALLOC
|
|
|
|
/* An object allocator for Python.
|
|
|
|
Here is an introduction to the layers of the Python memory architecture,
|
|
showing where the object allocator is actually used (layer +2), It is
|
|
called for every object allocation and deallocation (PyObject_New/Del),
|
|
unless the object-specific allocators implement a proprietary allocation
|
|
scheme (ex.: ints use a simple free list). This is also the place where
|
|
the cyclic garbage collector operates selectively on container objects.
|
|
|
|
|
|
Object-specific allocators
|
|
_____ ______ ______ ________
|
|
[ int ] [ dict ] [ list ] ... [ string ] Python core |
|
|
+3 | <----- Object-specific memory -----> | <-- Non-object memory --> |
|
|
_______________________________ | |
|
|
[ Python's object allocator ] | |
|
|
+2 | ####### Object memory ####### | <------ Internal buffers ------> |
|
|
______________________________________________________________ |
|
|
[ Python's raw memory allocator (PyMem_ API) ] |
|
|
+1 | <----- Python memory (under PyMem manager's control) ------> | |
|
|
__________________________________________________________________
|
|
[ Underlying general-purpose allocator (ex: C library malloc) ]
|
|
0 | <------ Virtual memory allocated for the python process -------> |
|
|
|
|
=========================================================================
|
|
_______________________________________________________________________
|
|
[ OS-specific Virtual Memory Manager (VMM) ]
|
|
-1 | <--- Kernel dynamic storage allocation & management (page-based) ---> |
|
|
__________________________________ __________________________________
|
|
[ ] [ ]
|
|
-2 | <-- Physical memory: ROM/RAM --> | | <-- Secondary storage (swap) --> |
|
|
|
|
*/
|
|
/*==========================================================================*/
|
|
|
|
/* A fast, special-purpose memory allocator for small blocks, to be used
|
|
on top of a general-purpose malloc -- heavily based on previous art. */
|
|
|
|
/* Vladimir Marangozov -- August 2000 */
|
|
|
|
/*
|
|
* "Memory management is where the rubber meets the road -- if we do the wrong
|
|
* thing at any level, the results will not be good. And if we don't make the
|
|
* levels work well together, we are in serious trouble." (1)
|
|
*
|
|
* (1) Paul R. Wilson, Mark S. Johnstone, Michael Neely, and David Boles,
|
|
* "Dynamic Storage Allocation: A Survey and Critical Review",
|
|
* in Proc. 1995 Int'l. Workshop on Memory Management, September 1995.
|
|
*/
|
|
|
|
/* #undef WITH_MEMORY_LIMITS */ /* disable mem limit checks */
|
|
|
|
/*==========================================================================*/
|
|
|
|
/*
|
|
* Allocation strategy abstract:
|
|
*
|
|
* For small requests, the allocator sub-allocates <Big> blocks of memory.
|
|
* Requests greater than 256 bytes are routed to the system's allocator.
|
|
*
|
|
* Small requests are grouped in size classes spaced 8 bytes apart, due
|
|
* to the required valid alignment of the returned address. Requests of
|
|
* a particular size are serviced from memory pools of 4K (one VMM page).
|
|
* Pools are fragmented on demand and contain free lists of blocks of one
|
|
* particular size class. In other words, there is a fixed-size allocator
|
|
* for each size class. Free pools are shared by the different allocators
|
|
* thus minimizing the space reserved for a particular size class.
|
|
*
|
|
* This allocation strategy is a variant of what is known as "simple
|
|
* segregated storage based on array of free lists". The main drawback of
|
|
* simple segregated storage is that we might end up with lot of reserved
|
|
* memory for the different free lists, which degenerate in time. To avoid
|
|
* this, we partition each free list in pools and we share dynamically the
|
|
* reserved space between all free lists. This technique is quite efficient
|
|
* for memory intensive programs which allocate mainly small-sized blocks.
|
|
*
|
|
* For small requests we have the following table:
|
|
*
|
|
* Request in bytes Size of allocated block Size class idx
|
|
* ----------------------------------------------------------------
|
|
* 1-8 8 0
|
|
* 9-16 16 1
|
|
* 17-24 24 2
|
|
* 25-32 32 3
|
|
* 33-40 40 4
|
|
* 41-48 48 5
|
|
* 49-56 56 6
|
|
* 57-64 64 7
|
|
* 65-72 72 8
|
|
* ... ... ...
|
|
* 241-248 248 30
|
|
* 249-256 256 31
|
|
*
|
|
* 0, 257 and up: routed to the underlying allocator.
|
|
*/
|
|
|
|
/*==========================================================================*/
|
|
|
|
/*
|
|
* -- Main tunable settings section --
|
|
*/
|
|
|
|
/*
|
|
* Alignment of addresses returned to the user. 8-bytes alignment works
|
|
* on most current architectures (with 32-bit or 64-bit address busses).
|
|
* The alignment value is also used for grouping small requests in size
|
|
* classes spaced ALIGNMENT bytes apart.
|
|
*
|
|
* You shouldn't change this unless you know what you are doing.
|
|
*/
|
|
#define ALIGNMENT 8 /* must be 2^N */
|
|
#define ALIGNMENT_SHIFT 3
|
|
#define ALIGNMENT_MASK (ALIGNMENT - 1)
|
|
|
|
/* Return the number of bytes in size class I, as a uint. */
|
|
#define INDEX2SIZE(I) (((uint)(I) + 1) << ALIGNMENT_SHIFT)
|
|
|
|
/*
|
|
* Max size threshold below which malloc requests are considered to be
|
|
* small enough in order to use preallocated memory pools. You can tune
|
|
* this value according to your application behaviour and memory needs.
|
|
*
|
|
* The following invariants must hold:
|
|
* 1) ALIGNMENT <= SMALL_REQUEST_THRESHOLD <= 256
|
|
* 2) SMALL_REQUEST_THRESHOLD is evenly divisible by ALIGNMENT
|
|
*
|
|
* Although not required, for better performance and space efficiency,
|
|
* it is recommended that SMALL_REQUEST_THRESHOLD is set to a power of 2.
|
|
*/
|
|
#define SMALL_REQUEST_THRESHOLD 256
|
|
#define NB_SMALL_SIZE_CLASSES (SMALL_REQUEST_THRESHOLD / ALIGNMENT)
|
|
|
|
/*
|
|
* The system's VMM page size can be obtained on most unices with a
|
|
* getpagesize() call or deduced from various header files. To make
|
|
* things simpler, we assume that it is 4K, which is OK for most systems.
|
|
* It is probably better if this is the native page size, but it doesn't
|
|
* have to be. In theory, if SYSTEM_PAGE_SIZE is larger than the native page
|
|
* size, then `POOL_ADDR(p)->arenaindex' could rarely cause a segmentation
|
|
* violation fault. 4K is apparently OK for all the platforms that python
|
|
* currently targets.
|
|
*/
|
|
#define SYSTEM_PAGE_SIZE (4 * 1024)
|
|
#define SYSTEM_PAGE_SIZE_MASK (SYSTEM_PAGE_SIZE - 1)
|
|
|
|
/*
|
|
* Maximum amount of memory managed by the allocator for small requests.
|
|
*/
|
|
#ifdef WITH_MEMORY_LIMITS
|
|
#ifndef SMALL_MEMORY_LIMIT
|
|
#define SMALL_MEMORY_LIMIT (64 * 1024 * 1024) /* 64 MB -- more? */
|
|
#endif
|
|
#endif
|
|
|
|
/*
|
|
* The allocator sub-allocates <Big> blocks of memory (called arenas) aligned
|
|
* on a page boundary. This is a reserved virtual address space for the
|
|
* current process (obtained through a malloc call). In no way this means
|
|
* that the memory arenas will be used entirely. A malloc(<Big>) is usually
|
|
* an address range reservation for <Big> bytes, unless all pages within this
|
|
* space are referenced subsequently. So malloc'ing big blocks and not using
|
|
* them does not mean "wasting memory". It's an addressable range wastage...
|
|
*
|
|
* Therefore, allocating arenas with malloc is not optimal, because there is
|
|
* some address space wastage, but this is the most portable way to request
|
|
* memory from the system across various platforms.
|
|
*/
|
|
#define ARENA_SIZE (256 << 10) /* 256KB */
|
|
|
|
#ifdef WITH_MEMORY_LIMITS
|
|
#define MAX_ARENAS (SMALL_MEMORY_LIMIT / ARENA_SIZE)
|
|
#endif
|
|
|
|
/*
|
|
* Size of the pools used for small blocks. Should be a power of 2,
|
|
* between 1K and SYSTEM_PAGE_SIZE, that is: 1k, 2k, 4k.
|
|
*/
|
|
#define POOL_SIZE SYSTEM_PAGE_SIZE /* must be 2^N */
|
|
#define POOL_SIZE_MASK SYSTEM_PAGE_SIZE_MASK
|
|
|
|
/*
|
|
* -- End of tunable settings section --
|
|
*/
|
|
|
|
/*==========================================================================*/
|
|
|
|
/*
|
|
* Locking
|
|
*
|
|
* To reduce lock contention, it would probably be better to refine the
|
|
* crude function locking with per size class locking. I'm not positive
|
|
* however, whether it's worth switching to such locking policy because
|
|
* of the performance penalty it might introduce.
|
|
*
|
|
* The following macros describe the simplest (should also be the fastest)
|
|
* lock object on a particular platform and the init/fini/lock/unlock
|
|
* operations on it. The locks defined here are not expected to be recursive
|
|
* because it is assumed that they will always be called in the order:
|
|
* INIT, [LOCK, UNLOCK]*, FINI.
|
|
*/
|
|
|
|
/*
|
|
* Python's threads are serialized, so object malloc locking is disabled.
|
|
*/
|
|
#define SIMPLELOCK_DECL(lock) /* simple lock declaration */
|
|
#define SIMPLELOCK_INIT(lock) /* allocate (if needed) and initialize */
|
|
#define SIMPLELOCK_FINI(lock) /* free/destroy an existing lock */
|
|
#define SIMPLELOCK_LOCK(lock) /* acquire released lock */
|
|
#define SIMPLELOCK_UNLOCK(lock) /* release acquired lock */
|
|
|
|
/*
|
|
* Basic types
|
|
* I don't care if these are defined in <sys/types.h> or elsewhere. Axiom.
|
|
*/
|
|
#undef uchar
|
|
#define uchar unsigned char /* assuming == 8 bits */
|
|
|
|
#undef uint
|
|
#define uint unsigned int /* assuming >= 16 bits */
|
|
|
|
#undef ulong
|
|
#define ulong unsigned long /* assuming >= 32 bits */
|
|
|
|
#undef uptr
|
|
#define uptr Py_uintptr_t
|
|
|
|
/* When you say memory, my mind reasons in terms of (pointers to) blocks */
|
|
typedef uchar block;
|
|
|
|
/* Pool for small blocks. */
|
|
struct pool_header {
|
|
union { block *_padding;
|
|
uint count; } ref; /* number of allocated blocks */
|
|
block *freeblock; /* pool's free list head */
|
|
struct pool_header *nextpool; /* next pool of this size class */
|
|
struct pool_header *prevpool; /* previous pool "" */
|
|
uint arenaindex; /* index into arenas of base adr */
|
|
uint szidx; /* block size class index */
|
|
uint nextoffset; /* bytes to virgin block */
|
|
uint maxnextoffset; /* largest valid nextoffset */
|
|
};
|
|
|
|
typedef struct pool_header *poolp;
|
|
|
|
/* Record keeping for arenas. */
|
|
struct arena_object {
|
|
/* The address of the arena, as returned by malloc. Note that 0
|
|
* will never be returned by a successful malloc, and is used
|
|
* here to mark an arena_object that doesn't correspond to an
|
|
* allocated arena.
|
|
*/
|
|
uptr address;
|
|
|
|
/* Pool-aligned pointer to the next pool to be carved off. */
|
|
block* pool_address;
|
|
|
|
/* The number of available pools in the arena: free pools + never-
|
|
* allocated pools.
|
|
*/
|
|
uint nfreepools;
|
|
|
|
/* The total number of pools in the arena, whether or not available. */
|
|
uint ntotalpools;
|
|
|
|
/* Singly-linked list of available pools. */
|
|
struct pool_header* freepools;
|
|
|
|
/* Whenever this arena_object is not associated with an allocated
|
|
* arena, the nextarena member is used to link all unassociated
|
|
* arena_objects in the singly-linked `unused_arena_objects` list.
|
|
* The prevarena member is unused in this case.
|
|
*
|
|
* When this arena_object is associated with an allocated arena
|
|
* with at least one available pool, both members are used in the
|
|
* doubly-linked `usable_arenas` list, which is maintained in
|
|
* increasing order of `nfreepools` values.
|
|
*
|
|
* Else this arena_object is associated with an allocated arena
|
|
* all of whose pools are in use. `nextarena` and `prevarena`
|
|
* are both meaningless in this case.
|
|
*/
|
|
struct arena_object* nextarena;
|
|
struct arena_object* prevarena;
|
|
};
|
|
|
|
#undef ROUNDUP
|
|
#define ROUNDUP(x) (((x) + ALIGNMENT_MASK) & ~ALIGNMENT_MASK)
|
|
#define POOL_OVERHEAD ROUNDUP(sizeof(struct pool_header))
|
|
|
|
#define DUMMY_SIZE_IDX 0xffff /* size class of newly cached pools */
|
|
|
|
/* Round pointer P down to the closest pool-aligned address <= P, as a poolp */
|
|
#define POOL_ADDR(P) ((poolp)((uptr)(P) & ~(uptr)POOL_SIZE_MASK))
|
|
|
|
/* Return total number of blocks in pool of size index I, as a uint. */
|
|
#define NUMBLOCKS(I) ((uint)(POOL_SIZE - POOL_OVERHEAD) / INDEX2SIZE(I))
|
|
|
|
/*==========================================================================*/
|
|
|
|
/*
|
|
* This malloc lock
|
|
*/
|
|
SIMPLELOCK_DECL(_malloc_lock)
|
|
#define LOCK() SIMPLELOCK_LOCK(_malloc_lock)
|
|
#define UNLOCK() SIMPLELOCK_UNLOCK(_malloc_lock)
|
|
#define LOCK_INIT() SIMPLELOCK_INIT(_malloc_lock)
|
|
#define LOCK_FINI() SIMPLELOCK_FINI(_malloc_lock)
|
|
|
|
/*
|
|
* Pool table -- headed, circular, doubly-linked lists of partially used pools.
|
|
|
|
This is involved. For an index i, usedpools[i+i] is the header for a list of
|
|
all partially used pools holding small blocks with "size class idx" i. So
|
|
usedpools[0] corresponds to blocks of size 8, usedpools[2] to blocks of size
|
|
16, and so on: index 2*i <-> blocks of size (i+1)<<ALIGNMENT_SHIFT.
|
|
|
|
Pools are carved off an arena's highwater mark (an arena_object's pool_address
|
|
member) as needed. Once carved off, a pool is in one of three states forever
|
|
after:
|
|
|
|
used == partially used, neither empty nor full
|
|
At least one block in the pool is currently allocated, and at least one
|
|
block in the pool is not currently allocated (note this implies a pool
|
|
has room for at least two blocks).
|
|
This is a pool's initial state, as a pool is created only when malloc
|
|
needs space.
|
|
The pool holds blocks of a fixed size, and is in the circular list headed
|
|
at usedpools[i] (see above). It's linked to the other used pools of the
|
|
same size class via the pool_header's nextpool and prevpool members.
|
|
If all but one block is currently allocated, a malloc can cause a
|
|
transition to the full state. If all but one block is not currently
|
|
allocated, a free can cause a transition to the empty state.
|
|
|
|
full == all the pool's blocks are currently allocated
|
|
On transition to full, a pool is unlinked from its usedpools[] list.
|
|
It's not linked to from anything then anymore, and its nextpool and
|
|
prevpool members are meaningless until it transitions back to used.
|
|
A free of a block in a full pool puts the pool back in the used state.
|
|
Then it's linked in at the front of the appropriate usedpools[] list, so
|
|
that the next allocation for its size class will reuse the freed block.
|
|
|
|
empty == all the pool's blocks are currently available for allocation
|
|
On transition to empty, a pool is unlinked from its usedpools[] list,
|
|
and linked to the front of its arena_object's singly-linked freepools list,
|
|
via its nextpool member. The prevpool member has no meaning in this case.
|
|
Empty pools have no inherent size class: the next time a malloc finds
|
|
an empty list in usedpools[], it takes the first pool off of freepools.
|
|
If the size class needed happens to be the same as the size class the pool
|
|
last had, some pool initialization can be skipped.
|
|
|
|
|
|
Block Management
|
|
|
|
Blocks within pools are again carved out as needed. pool->freeblock points to
|
|
the start of a singly-linked list of free blocks within the pool. When a
|
|
block is freed, it's inserted at the front of its pool's freeblock list. Note
|
|
that the available blocks in a pool are *not* linked all together when a pool
|
|
is initialized. Instead only "the first two" (lowest addresses) blocks are
|
|
set up, returning the first such block, and setting pool->freeblock to a
|
|
one-block list holding the second such block. This is consistent with that
|
|
pymalloc strives at all levels (arena, pool, and block) never to touch a piece
|
|
of memory until it's actually needed.
|
|
|
|
So long as a pool is in the used state, we're certain there *is* a block
|
|
available for allocating, and pool->freeblock is not NULL. If pool->freeblock
|
|
points to the end of the free list before we've carved the entire pool into
|
|
blocks, that means we simply haven't yet gotten to one of the higher-address
|
|
blocks. The offset from the pool_header to the start of "the next" virgin
|
|
block is stored in the pool_header nextoffset member, and the largest value
|
|
of nextoffset that makes sense is stored in the maxnextoffset member when a
|
|
pool is initialized. All the blocks in a pool have been passed out at least
|
|
once when and only when nextoffset > maxnextoffset.
|
|
|
|
|
|
Major obscurity: While the usedpools vector is declared to have poolp
|
|
entries, it doesn't really. It really contains two pointers per (conceptual)
|
|
poolp entry, the nextpool and prevpool members of a pool_header. The
|
|
excruciating initialization code below fools C so that
|
|
|
|
usedpool[i+i]
|
|
|
|
"acts like" a genuine poolp, but only so long as you only reference its
|
|
nextpool and prevpool members. The "- 2*sizeof(block *)" gibberish is
|
|
compensating for that a pool_header's nextpool and prevpool members
|
|
immediately follow a pool_header's first two members:
|
|
|
|
union { block *_padding;
|
|
uint count; } ref;
|
|
block *freeblock;
|
|
|
|
each of which consume sizeof(block *) bytes. So what usedpools[i+i] really
|
|
contains is a fudged-up pointer p such that *if* C believes it's a poolp
|
|
pointer, then p->nextpool and p->prevpool are both p (meaning that the headed
|
|
circular list is empty).
|
|
|
|
It's unclear why the usedpools setup is so convoluted. It could be to
|
|
minimize the amount of cache required to hold this heavily-referenced table
|
|
(which only *needs* the two interpool pointer members of a pool_header). OTOH,
|
|
referencing code has to remember to "double the index" and doing so isn't
|
|
free, usedpools[0] isn't a strictly legal pointer, and we're crucially relying
|
|
on that C doesn't insert any padding anywhere in a pool_header at or before
|
|
the prevpool member.
|
|
**************************************************************************** */
|
|
|
|
#define PTA(x) ((poolp )((uchar *)&(usedpools[2*(x)]) - 2*sizeof(block *)))
|
|
#define PT(x) PTA(x), PTA(x)
|
|
|
|
static poolp usedpools[2 * ((NB_SMALL_SIZE_CLASSES + 7) / 8) * 8] = {
|
|
PT(0), PT(1), PT(2), PT(3), PT(4), PT(5), PT(6), PT(7)
|
|
#if NB_SMALL_SIZE_CLASSES > 8
|
|
, PT(8), PT(9), PT(10), PT(11), PT(12), PT(13), PT(14), PT(15)
|
|
#if NB_SMALL_SIZE_CLASSES > 16
|
|
, PT(16), PT(17), PT(18), PT(19), PT(20), PT(21), PT(22), PT(23)
|
|
#if NB_SMALL_SIZE_CLASSES > 24
|
|
, PT(24), PT(25), PT(26), PT(27), PT(28), PT(29), PT(30), PT(31)
|
|
#if NB_SMALL_SIZE_CLASSES > 32
|
|
, PT(32), PT(33), PT(34), PT(35), PT(36), PT(37), PT(38), PT(39)
|
|
#if NB_SMALL_SIZE_CLASSES > 40
|
|
, PT(40), PT(41), PT(42), PT(43), PT(44), PT(45), PT(46), PT(47)
|
|
#if NB_SMALL_SIZE_CLASSES > 48
|
|
, PT(48), PT(49), PT(50), PT(51), PT(52), PT(53), PT(54), PT(55)
|
|
#if NB_SMALL_SIZE_CLASSES > 56
|
|
, PT(56), PT(57), PT(58), PT(59), PT(60), PT(61), PT(62), PT(63)
|
|
#endif /* NB_SMALL_SIZE_CLASSES > 56 */
|
|
#endif /* NB_SMALL_SIZE_CLASSES > 48 */
|
|
#endif /* NB_SMALL_SIZE_CLASSES > 40 */
|
|
#endif /* NB_SMALL_SIZE_CLASSES > 32 */
|
|
#endif /* NB_SMALL_SIZE_CLASSES > 24 */
|
|
#endif /* NB_SMALL_SIZE_CLASSES > 16 */
|
|
#endif /* NB_SMALL_SIZE_CLASSES > 8 */
|
|
};
|
|
|
|
/*==========================================================================
|
|
Arena management.
|
|
|
|
`arenas` is a vector of arena_objects. It contains maxarenas entries, some of
|
|
which may not be currently used (== they're arena_objects that aren't
|
|
currently associated with an allocated arena). Note that arenas proper are
|
|
separately malloc'ed.
|
|
|
|
Prior to Python 2.5, arenas were never free()'ed. Starting with Python 2.5,
|
|
we do try to free() arenas, and use some mild heuristic strategies to increase
|
|
the likelihood that arenas eventually can be freed.
|
|
|
|
unused_arena_objects
|
|
|
|
This is a singly-linked list of the arena_objects that are currently not
|
|
being used (no arena is associated with them). Objects are taken off the
|
|
head of the list in new_arena(), and are pushed on the head of the list in
|
|
PyObject_Free() when the arena is empty. Key invariant: an arena_object
|
|
is on this list if and only if its .address member is 0.
|
|
|
|
usable_arenas
|
|
|
|
This is a doubly-linked list of the arena_objects associated with arenas
|
|
that have pools available. These pools are either waiting to be reused,
|
|
or have not been used before. The list is sorted to have the most-
|
|
allocated arenas first (ascending order based on the nfreepools member).
|
|
This means that the next allocation will come from a heavily used arena,
|
|
which gives the nearly empty arenas a chance to be returned to the system.
|
|
In my unscientific tests this dramatically improved the number of arenas
|
|
that could be freed.
|
|
|
|
Note that an arena_object associated with an arena all of whose pools are
|
|
currently in use isn't on either list.
|
|
*/
|
|
|
|
/* Array of objects used to track chunks of memory (arenas). */
|
|
static struct arena_object* arenas = NULL;
|
|
/* Number of slots currently allocated in the `arenas` vector. */
|
|
static uint maxarenas = 0;
|
|
|
|
/* The head of the singly-linked, NULL-terminated list of available
|
|
* arena_objects.
|
|
*/
|
|
static struct arena_object* unused_arena_objects = NULL;
|
|
|
|
/* The head of the doubly-linked, NULL-terminated at each end, list of
|
|
* arena_objects associated with arenas that have pools available.
|
|
*/
|
|
static struct arena_object* usable_arenas = NULL;
|
|
|
|
/* How many arena_objects do we initially allocate?
|
|
* 16 = can allocate 16 arenas = 16 * ARENA_SIZE = 4MB before growing the
|
|
* `arenas` vector.
|
|
*/
|
|
#define INITIAL_ARENA_OBJECTS 16
|
|
|
|
/* Number of arenas allocated that haven't been free()'d. */
|
|
static size_t narenas_currently_allocated = 0;
|
|
|
|
#ifdef PYMALLOC_DEBUG
|
|
/* Total number of times malloc() called to allocate an arena. */
|
|
static size_t ntimes_arena_allocated = 0;
|
|
/* High water mark (max value ever seen) for narenas_currently_allocated. */
|
|
static size_t narenas_highwater = 0;
|
|
#endif
|
|
|
|
/* Allocate a new arena. If we run out of memory, return NULL. Else
|
|
* allocate a new arena, and return the address of an arena_object
|
|
* describing the new arena. It's expected that the caller will set
|
|
* `usable_arenas` to the return value.
|
|
*/
|
|
static struct arena_object*
|
|
new_arena(void)
|
|
{
|
|
struct arena_object* arenaobj;
|
|
uint excess; /* number of bytes above pool alignment */
|
|
|
|
#ifdef PYMALLOC_DEBUG
|
|
if (Py_GETENV("PYTHONMALLOCSTATS"))
|
|
_PyObject_DebugMallocStats();
|
|
#endif
|
|
if (unused_arena_objects == NULL) {
|
|
uint i;
|
|
uint numarenas;
|
|
size_t nbytes;
|
|
|
|
/* Double the number of arena objects on each allocation.
|
|
* Note that it's possible for `numarenas` to overflow.
|
|
*/
|
|
numarenas = maxarenas ? maxarenas << 1 : INITIAL_ARENA_OBJECTS;
|
|
if (numarenas <= maxarenas)
|
|
return NULL; /* overflow */
|
|
nbytes = numarenas * sizeof(*arenas);
|
|
if (nbytes / sizeof(*arenas) != numarenas)
|
|
return NULL; /* overflow */
|
|
arenaobj = (struct arena_object *)realloc(arenas, nbytes);
|
|
if (arenaobj == NULL)
|
|
return NULL;
|
|
arenas = arenaobj;
|
|
|
|
/* We might need to fix pointers that were copied. However,
|
|
* new_arena only gets called when all the pages in the
|
|
* previous arenas are full. Thus, there are *no* pointers
|
|
* into the old array. Thus, we don't have to worry about
|
|
* invalid pointers. Just to be sure, some asserts:
|
|
*/
|
|
assert(usable_arenas == NULL);
|
|
assert(unused_arena_objects == NULL);
|
|
|
|
/* Put the new arenas on the unused_arena_objects list. */
|
|
for (i = maxarenas; i < numarenas; ++i) {
|
|
arenas[i].address = 0; /* mark as unassociated */
|
|
arenas[i].nextarena = i < numarenas - 1 ?
|
|
&arenas[i+1] : NULL;
|
|
}
|
|
|
|
/* Update globals. */
|
|
unused_arena_objects = &arenas[maxarenas];
|
|
maxarenas = numarenas;
|
|
}
|
|
|
|
/* Take the next available arena object off the head of the list. */
|
|
assert(unused_arena_objects != NULL);
|
|
arenaobj = unused_arena_objects;
|
|
unused_arena_objects = arenaobj->nextarena;
|
|
assert(arenaobj->address == 0);
|
|
arenaobj->address = (uptr)malloc(ARENA_SIZE);
|
|
if (arenaobj->address == 0) {
|
|
/* The allocation failed: return NULL after putting the
|
|
* arenaobj back.
|
|
*/
|
|
arenaobj->nextarena = unused_arena_objects;
|
|
unused_arena_objects = arenaobj;
|
|
return NULL;
|
|
}
|
|
|
|
++narenas_currently_allocated;
|
|
#ifdef PYMALLOC_DEBUG
|
|
++ntimes_arena_allocated;
|
|
if (narenas_currently_allocated > narenas_highwater)
|
|
narenas_highwater = narenas_currently_allocated;
|
|
#endif
|
|
arenaobj->freepools = NULL;
|
|
/* pool_address <- first pool-aligned address in the arena
|
|
nfreepools <- number of whole pools that fit after alignment */
|
|
arenaobj->pool_address = (block*)arenaobj->address;
|
|
arenaobj->nfreepools = ARENA_SIZE / POOL_SIZE;
|
|
assert(POOL_SIZE * arenaobj->nfreepools == ARENA_SIZE);
|
|
excess = (uint)(arenaobj->address & POOL_SIZE_MASK);
|
|
if (excess != 0) {
|
|
--arenaobj->nfreepools;
|
|
arenaobj->pool_address += POOL_SIZE - excess;
|
|
}
|
|
arenaobj->ntotalpools = arenaobj->nfreepools;
|
|
|
|
return arenaobj;
|
|
}
|
|
|
|
/*
|
|
Py_ADDRESS_IN_RANGE(P, POOL)
|
|
|
|
Return true if and only if P is an address that was allocated by pymalloc.
|
|
POOL must be the pool address associated with P, i.e., POOL = POOL_ADDR(P)
|
|
(the caller is asked to compute this because the macro expands POOL more than
|
|
once, and for efficiency it's best for the caller to assign POOL_ADDR(P) to a
|
|
variable and pass the latter to the macro; because Py_ADDRESS_IN_RANGE is
|
|
called on every alloc/realloc/free, micro-efficiency is important here).
|
|
|
|
Tricky: Let B be the arena base address associated with the pool, B =
|
|
arenas[(POOL)->arenaindex].address. Then P belongs to the arena if and only if
|
|
|
|
B <= P < B + ARENA_SIZE
|
|
|
|
Subtracting B throughout, this is true iff
|
|
|
|
0 <= P-B < ARENA_SIZE
|
|
|
|
By using unsigned arithmetic, the "0 <=" half of the test can be skipped.
|
|
|
|
Obscure: A PyMem "free memory" function can call the pymalloc free or realloc
|
|
before the first arena has been allocated. `arenas` is still NULL in that
|
|
case. We're relying on that maxarenas is also 0 in that case, so that
|
|
(POOL)->arenaindex < maxarenas must be false, saving us from trying to index
|
|
into a NULL arenas.
|
|
|
|
Details: given P and POOL, the arena_object corresponding to P is AO =
|
|
arenas[(POOL)->arenaindex]. Suppose obmalloc controls P. Then (barring wild
|
|
stores, etc), POOL is the correct address of P's pool, AO.address is the
|
|
correct base address of the pool's arena, and P must be within ARENA_SIZE of
|
|
AO.address. In addition, AO.address is not 0 (no arena can start at address 0
|
|
(NULL)). Therefore Py_ADDRESS_IN_RANGE correctly reports that obmalloc
|
|
controls P.
|
|
|
|
Now suppose obmalloc does not control P (e.g., P was obtained via a direct
|
|
call to the system malloc() or realloc()). (POOL)->arenaindex may be anything
|
|
in this case -- it may even be uninitialized trash. If the trash arenaindex
|
|
is >= maxarenas, the macro correctly concludes at once that obmalloc doesn't
|
|
control P.
|
|
|
|
Else arenaindex is < maxarena, and AO is read up. If AO corresponds to an
|
|
allocated arena, obmalloc controls all the memory in slice AO.address :
|
|
AO.address+ARENA_SIZE. By case assumption, P is not controlled by obmalloc,
|
|
so P doesn't lie in that slice, so the macro correctly reports that P is not
|
|
controlled by obmalloc.
|
|
|
|
Finally, if P is not controlled by obmalloc and AO corresponds to an unused
|
|
arena_object (one not currently associated with an allocated arena),
|
|
AO.address is 0, and the second test in the macro reduces to:
|
|
|
|
P < ARENA_SIZE
|
|
|
|
If P >= ARENA_SIZE (extremely likely), the macro again correctly concludes
|
|
that P is not controlled by obmalloc. However, if P < ARENA_SIZE, this part
|
|
of the test still passes, and the third clause (AO.address != 0) is necessary
|
|
to get the correct result: AO.address is 0 in this case, so the macro
|
|
correctly reports that P is not controlled by obmalloc (despite that P lies in
|
|
slice AO.address : AO.address + ARENA_SIZE).
|
|
|
|
Note: The third (AO.address != 0) clause was added in Python 2.5. Before
|
|
2.5, arenas were never free()'ed, and an arenaindex < maxarena always
|
|
corresponded to a currently-allocated arena, so the "P is not controlled by
|
|
obmalloc, AO corresponds to an unused arena_object, and P < ARENA_SIZE" case
|
|
was impossible.
|
|
|
|
Note that the logic is excruciating, and reading up possibly uninitialized
|
|
memory when P is not controlled by obmalloc (to get at (POOL)->arenaindex)
|
|
creates problems for some memory debuggers. The overwhelming advantage is
|
|
that this test determines whether an arbitrary address is controlled by
|
|
obmalloc in a small constant time, independent of the number of arenas
|
|
obmalloc controls. Since this test is needed at every entry point, it's
|
|
extremely desirable that it be this fast.
|
|
*/
|
|
#define Py_ADDRESS_IN_RANGE(P, POOL) \
|
|
((POOL)->arenaindex < maxarenas && \
|
|
(uptr)(P) - arenas[(POOL)->arenaindex].address < (uptr)ARENA_SIZE && \
|
|
arenas[(POOL)->arenaindex].address != 0)
|
|
|
|
|
|
/* This is only useful when running memory debuggers such as
|
|
* Purify or Valgrind. Uncomment to use.
|
|
*
|
|
#define Py_USING_MEMORY_DEBUGGER
|
|
*/
|
|
|
|
#ifdef Py_USING_MEMORY_DEBUGGER
|
|
|
|
/* Py_ADDRESS_IN_RANGE may access uninitialized memory by design
|
|
* This leads to thousands of spurious warnings when using
|
|
* Purify or Valgrind. By making a function, we can easily
|
|
* suppress the uninitialized memory reads in this one function.
|
|
* So we won't ignore real errors elsewhere.
|
|
*
|
|
* Disable the macro and use a function.
|
|
*/
|
|
|
|
#undef Py_ADDRESS_IN_RANGE
|
|
|
|
#if defined(__GNUC__) && ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 1) || \
|
|
(__GNUC__ >= 4))
|
|
#define Py_NO_INLINE __attribute__((__noinline__))
|
|
#else
|
|
#define Py_NO_INLINE
|
|
#endif
|
|
|
|
/* Don't make static, to try to ensure this isn't inlined. */
|
|
int Py_ADDRESS_IN_RANGE(void *P, poolp pool) Py_NO_INLINE;
|
|
#undef Py_NO_INLINE
|
|
#endif
|
|
|
|
/*==========================================================================*/
|
|
|
|
/* malloc. Note that nbytes==0 tries to return a non-NULL pointer, distinct
|
|
* from all other currently live pointers. This may not be possible.
|
|
*/
|
|
|
|
/*
|
|
* The basic blocks are ordered by decreasing execution frequency,
|
|
* which minimizes the number of jumps in the most common cases,
|
|
* improves branching prediction and instruction scheduling (small
|
|
* block allocations typically result in a couple of instructions).
|
|
* Unless the optimizer reorders everything, being too smart...
|
|
*/
|
|
|
|
#undef PyObject_Malloc
|
|
void *
|
|
PyObject_Malloc(size_t nbytes)
|
|
{
|
|
block *bp;
|
|
poolp pool;
|
|
poolp next;
|
|
uint size;
|
|
|
|
/*
|
|
* This implicitly redirects malloc(0).
|
|
*/
|
|
if ((nbytes - 1) < SMALL_REQUEST_THRESHOLD) {
|
|
LOCK();
|
|
/*
|
|
* Most frequent paths first
|
|
*/
|
|
size = (uint)(nbytes - 1) >> ALIGNMENT_SHIFT;
|
|
pool = usedpools[size + size];
|
|
if (pool != pool->nextpool) {
|
|
/*
|
|
* There is a used pool for this size class.
|
|
* Pick up the head block of its free list.
|
|
*/
|
|
++pool->ref.count;
|
|
bp = pool->freeblock;
|
|
assert(bp != NULL);
|
|
if ((pool->freeblock = *(block **)bp) != NULL) {
|
|
UNLOCK();
|
|
return (void *)bp;
|
|
}
|
|
/*
|
|
* Reached the end of the free list, try to extend it.
|
|
*/
|
|
if (pool->nextoffset <= pool->maxnextoffset) {
|
|
/* There is room for another block. */
|
|
pool->freeblock = (block*)pool +
|
|
pool->nextoffset;
|
|
pool->nextoffset += INDEX2SIZE(size);
|
|
*(block **)(pool->freeblock) = NULL;
|
|
UNLOCK();
|
|
return (void *)bp;
|
|
}
|
|
/* Pool is full, unlink from used pools. */
|
|
next = pool->nextpool;
|
|
pool = pool->prevpool;
|
|
next->prevpool = pool;
|
|
pool->nextpool = next;
|
|
UNLOCK();
|
|
return (void *)bp;
|
|
}
|
|
|
|
/* There isn't a pool of the right size class immediately
|
|
* available: use a free pool.
|
|
*/
|
|
if (usable_arenas == NULL) {
|
|
/* No arena has a free pool: allocate a new arena. */
|
|
#ifdef WITH_MEMORY_LIMITS
|
|
if (narenas_currently_allocated >= MAX_ARENAS) {
|
|
UNLOCK();
|
|
goto redirect;
|
|
}
|
|
#endif
|
|
usable_arenas = new_arena();
|
|
if (usable_arenas == NULL) {
|
|
UNLOCK();
|
|
goto redirect;
|
|
}
|
|
usable_arenas->nextarena =
|
|
usable_arenas->prevarena = NULL;
|
|
}
|
|
assert(usable_arenas->address != 0);
|
|
|
|
/* Try to get a cached free pool. */
|
|
pool = usable_arenas->freepools;
|
|
if (pool != NULL) {
|
|
/* Unlink from cached pools. */
|
|
usable_arenas->freepools = pool->nextpool;
|
|
|
|
/* This arena already had the smallest nfreepools
|
|
* value, so decreasing nfreepools doesn't change
|
|
* that, and we don't need to rearrange the
|
|
* usable_arenas list. However, if the arena has
|
|
* become wholly allocated, we need to remove its
|
|
* arena_object from usable_arenas.
|
|
*/
|
|
--usable_arenas->nfreepools;
|
|
if (usable_arenas->nfreepools == 0) {
|
|
/* Wholly allocated: remove. */
|
|
assert(usable_arenas->freepools == NULL);
|
|
assert(usable_arenas->nextarena == NULL ||
|
|
usable_arenas->nextarena->prevarena ==
|
|
usable_arenas);
|
|
|
|
usable_arenas = usable_arenas->nextarena;
|
|
if (usable_arenas != NULL) {
|
|
usable_arenas->prevarena = NULL;
|
|
assert(usable_arenas->address != 0);
|
|
}
|
|
}
|
|
else {
|
|
/* nfreepools > 0: it must be that freepools
|
|
* isn't NULL, or that we haven't yet carved
|
|
* off all the arena's pools for the first
|
|
* time.
|
|
*/
|
|
assert(usable_arenas->freepools != NULL ||
|
|
usable_arenas->pool_address <=
|
|
(block*)usable_arenas->address +
|
|
ARENA_SIZE - POOL_SIZE);
|
|
}
|
|
init_pool:
|
|
/* Frontlink to used pools. */
|
|
next = usedpools[size + size]; /* == prev */
|
|
pool->nextpool = next;
|
|
pool->prevpool = next;
|
|
next->nextpool = pool;
|
|
next->prevpool = pool;
|
|
pool->ref.count = 1;
|
|
if (pool->szidx == size) {
|
|
/* Luckily, this pool last contained blocks
|
|
* of the same size class, so its header
|
|
* and free list are already initialized.
|
|
*/
|
|
bp = pool->freeblock;
|
|
pool->freeblock = *(block **)bp;
|
|
UNLOCK();
|
|
return (void *)bp;
|
|
}
|
|
/*
|
|
* Initialize the pool header, set up the free list to
|
|
* contain just the second block, and return the first
|
|
* block.
|
|
*/
|
|
pool->szidx = size;
|
|
size = INDEX2SIZE(size);
|
|
bp = (block *)pool + POOL_OVERHEAD;
|
|
pool->nextoffset = POOL_OVERHEAD + (size << 1);
|
|
pool->maxnextoffset = POOL_SIZE - size;
|
|
pool->freeblock = bp + size;
|
|
*(block **)(pool->freeblock) = NULL;
|
|
UNLOCK();
|
|
return (void *)bp;
|
|
}
|
|
|
|
/* Carve off a new pool. */
|
|
assert(usable_arenas->nfreepools > 0);
|
|
assert(usable_arenas->freepools == NULL);
|
|
pool = (poolp)usable_arenas->pool_address;
|
|
assert((block*)pool <= (block*)usable_arenas->address +
|
|
ARENA_SIZE - POOL_SIZE);
|
|
pool->arenaindex = usable_arenas - arenas;
|
|
assert(&arenas[pool->arenaindex] == usable_arenas);
|
|
pool->szidx = DUMMY_SIZE_IDX;
|
|
usable_arenas->pool_address += POOL_SIZE;
|
|
--usable_arenas->nfreepools;
|
|
|
|
if (usable_arenas->nfreepools == 0) {
|
|
assert(usable_arenas->nextarena == NULL ||
|
|
usable_arenas->nextarena->prevarena ==
|
|
usable_arenas);
|
|
/* Unlink the arena: it is completely allocated. */
|
|
usable_arenas = usable_arenas->nextarena;
|
|
if (usable_arenas != NULL) {
|
|
usable_arenas->prevarena = NULL;
|
|
assert(usable_arenas->address != 0);
|
|
}
|
|
}
|
|
|
|
goto init_pool;
|
|
}
|
|
|
|
/* The small block allocator ends here. */
|
|
|
|
redirect:
|
|
/* Redirect the original request to the underlying (libc) allocator.
|
|
* We jump here on bigger requests, on error in the code above (as a
|
|
* last chance to serve the request) or when the max memory limit
|
|
* has been reached.
|
|
*/
|
|
if (nbytes == 0)
|
|
nbytes = 1;
|
|
return (void *)malloc(nbytes);
|
|
}
|
|
|
|
/* free */
|
|
|
|
#undef PyObject_Free
|
|
void
|
|
PyObject_Free(void *p)
|
|
{
|
|
poolp pool;
|
|
block *lastfree;
|
|
poolp next, prev;
|
|
uint size;
|
|
|
|
if (p == NULL) /* free(NULL) has no effect */
|
|
return;
|
|
|
|
pool = POOL_ADDR(p);
|
|
if (Py_ADDRESS_IN_RANGE(p, pool)) {
|
|
/* We allocated this address. */
|
|
LOCK();
|
|
/* Link p to the start of the pool's freeblock list. Since
|
|
* the pool had at least the p block outstanding, the pool
|
|
* wasn't empty (so it's already in a usedpools[] list, or
|
|
* was full and is in no list -- it's not in the freeblocks
|
|
* list in any case).
|
|
*/
|
|
assert(pool->ref.count > 0); /* else it was empty */
|
|
*(block **)p = lastfree = pool->freeblock;
|
|
pool->freeblock = (block *)p;
|
|
if (lastfree) {
|
|
struct arena_object* ao;
|
|
uint nf; /* ao->nfreepools */
|
|
|
|
/* freeblock wasn't NULL, so the pool wasn't full,
|
|
* and the pool is in a usedpools[] list.
|
|
*/
|
|
if (--pool->ref.count != 0) {
|
|
/* pool isn't empty: leave it in usedpools */
|
|
UNLOCK();
|
|
return;
|
|
}
|
|
/* Pool is now empty: unlink from usedpools, and
|
|
* link to the front of freepools. This ensures that
|
|
* previously freed pools will be allocated later
|
|
* (being not referenced, they are perhaps paged out).
|
|
*/
|
|
next = pool->nextpool;
|
|
prev = pool->prevpool;
|
|
next->prevpool = prev;
|
|
prev->nextpool = next;
|
|
|
|
/* Link the pool to freepools. This is a singly-linked
|
|
* list, and pool->prevpool isn't used there.
|
|
*/
|
|
ao = &arenas[pool->arenaindex];
|
|
pool->nextpool = ao->freepools;
|
|
ao->freepools = pool;
|
|
nf = ++ao->nfreepools;
|
|
|
|
/* All the rest is arena management. We just freed
|
|
* a pool, and there are 4 cases for arena mgmt:
|
|
* 1. If all the pools are free, return the arena to
|
|
* the system free().
|
|
* 2. If this is the only free pool in the arena,
|
|
* add the arena back to the `usable_arenas` list.
|
|
* 3. If the "next" arena has a smaller count of free
|
|
* pools, we have to "slide this arena right" to
|
|
* restore that usable_arenas is sorted in order of
|
|
* nfreepools.
|
|
* 4. Else there's nothing more to do.
|
|
*/
|
|
if (nf == ao->ntotalpools) {
|
|
/* Case 1. First unlink ao from usable_arenas.
|
|
*/
|
|
assert(ao->prevarena == NULL ||
|
|
ao->prevarena->address != 0);
|
|
assert(ao ->nextarena == NULL ||
|
|
ao->nextarena->address != 0);
|
|
|
|
/* Fix the pointer in the prevarena, or the
|
|
* usable_arenas pointer.
|
|
*/
|
|
if (ao->prevarena == NULL) {
|
|
usable_arenas = ao->nextarena;
|
|
assert(usable_arenas == NULL ||
|
|
usable_arenas->address != 0);
|
|
}
|
|
else {
|
|
assert(ao->prevarena->nextarena == ao);
|
|
ao->prevarena->nextarena =
|
|
ao->nextarena;
|
|
}
|
|
/* Fix the pointer in the nextarena. */
|
|
if (ao->nextarena != NULL) {
|
|
assert(ao->nextarena->prevarena == ao);
|
|
ao->nextarena->prevarena =
|
|
ao->prevarena;
|
|
}
|
|
/* Record that this arena_object slot is
|
|
* available to be reused.
|
|
*/
|
|
ao->nextarena = unused_arena_objects;
|
|
unused_arena_objects = ao;
|
|
|
|
/* Free the entire arena. */
|
|
free((void *)ao->address);
|
|
ao->address = 0; /* mark unassociated */
|
|
--narenas_currently_allocated;
|
|
|
|
UNLOCK();
|
|
return;
|
|
}
|
|
if (nf == 1) {
|
|
/* Case 2. Put ao at the head of
|
|
* usable_arenas. Note that because
|
|
* ao->nfreepools was 0 before, ao isn't
|
|
* currently on the usable_arenas list.
|
|
*/
|
|
ao->nextarena = usable_arenas;
|
|
ao->prevarena = NULL;
|
|
if (usable_arenas)
|
|
usable_arenas->prevarena = ao;
|
|
usable_arenas = ao;
|
|
assert(usable_arenas->address != 0);
|
|
|
|
UNLOCK();
|
|
return;
|
|
}
|
|
/* If this arena is now out of order, we need to keep
|
|
* the list sorted. The list is kept sorted so that
|
|
* the "most full" arenas are used first, which allows
|
|
* the nearly empty arenas to be completely freed. In
|
|
* a few un-scientific tests, it seems like this
|
|
* approach allowed a lot more memory to be freed.
|
|
*/
|
|
if (ao->nextarena == NULL ||
|
|
nf <= ao->nextarena->nfreepools) {
|
|
/* Case 4. Nothing to do. */
|
|
UNLOCK();
|
|
return;
|
|
}
|
|
/* Case 3: We have to move the arena towards the end
|
|
* of the list, because it has more free pools than
|
|
* the arena to its right.
|
|
* First unlink ao from usable_arenas.
|
|
*/
|
|
if (ao->prevarena != NULL) {
|
|
/* ao isn't at the head of the list */
|
|
assert(ao->prevarena->nextarena == ao);
|
|
ao->prevarena->nextarena = ao->nextarena;
|
|
}
|
|
else {
|
|
/* ao is at the head of the list */
|
|
assert(usable_arenas == ao);
|
|
usable_arenas = ao->nextarena;
|
|
}
|
|
ao->nextarena->prevarena = ao->prevarena;
|
|
|
|
/* Locate the new insertion point by iterating over
|
|
* the list, using our nextarena pointer.
|
|
*/
|
|
while (ao->nextarena != NULL &&
|
|
nf > ao->nextarena->nfreepools) {
|
|
ao->prevarena = ao->nextarena;
|
|
ao->nextarena = ao->nextarena->nextarena;
|
|
}
|
|
|
|
/* Insert ao at this point. */
|
|
assert(ao->nextarena == NULL ||
|
|
ao->prevarena == ao->nextarena->prevarena);
|
|
assert(ao->prevarena->nextarena == ao->nextarena);
|
|
|
|
ao->prevarena->nextarena = ao;
|
|
if (ao->nextarena != NULL)
|
|
ao->nextarena->prevarena = ao;
|
|
|
|
/* Verify that the swaps worked. */
|
|
assert(ao->nextarena == NULL ||
|
|
nf <= ao->nextarena->nfreepools);
|
|
assert(ao->prevarena == NULL ||
|
|
nf > ao->prevarena->nfreepools);
|
|
assert(ao->nextarena == NULL ||
|
|
ao->nextarena->prevarena == ao);
|
|
assert((usable_arenas == ao &&
|
|
ao->prevarena == NULL) ||
|
|
ao->prevarena->nextarena == ao);
|
|
|
|
UNLOCK();
|
|
return;
|
|
}
|
|
/* Pool was full, so doesn't currently live in any list:
|
|
* link it to the front of the appropriate usedpools[] list.
|
|
* This mimics LRU pool usage for new allocations and
|
|
* targets optimal filling when several pools contain
|
|
* blocks of the same size class.
|
|
*/
|
|
--pool->ref.count;
|
|
assert(pool->ref.count > 0); /* else the pool is empty */
|
|
size = pool->szidx;
|
|
next = usedpools[size + size];
|
|
prev = next->prevpool;
|
|
/* insert pool before next: prev <-> pool <-> next */
|
|
pool->nextpool = next;
|
|
pool->prevpool = prev;
|
|
next->prevpool = pool;
|
|
prev->nextpool = pool;
|
|
UNLOCK();
|
|
return;
|
|
}
|
|
|
|
/* We didn't allocate this address. */
|
|
free(p);
|
|
}
|
|
|
|
/* realloc. If p is NULL, this acts like malloc(nbytes). Else if nbytes==0,
|
|
* then as the Python docs promise, we do not treat this like free(p), and
|
|
* return a non-NULL result.
|
|
*/
|
|
|
|
#undef PyObject_Realloc
|
|
void *
|
|
PyObject_Realloc(void *p, size_t nbytes)
|
|
{
|
|
void *bp;
|
|
poolp pool;
|
|
size_t size;
|
|
|
|
if (p == NULL)
|
|
return PyObject_Malloc(nbytes);
|
|
|
|
pool = POOL_ADDR(p);
|
|
if (Py_ADDRESS_IN_RANGE(p, pool)) {
|
|
/* We're in charge of this block */
|
|
size = INDEX2SIZE(pool->szidx);
|
|
if (nbytes <= size) {
|
|
/* The block is staying the same or shrinking. If
|
|
* it's shrinking, there's a tradeoff: it costs
|
|
* cycles to copy the block to a smaller size class,
|
|
* but it wastes memory not to copy it. The
|
|
* compromise here is to copy on shrink only if at
|
|
* least 25% of size can be shaved off.
|
|
*/
|
|
if (4 * nbytes > 3 * size) {
|
|
/* It's the same,
|
|
* or shrinking and new/old > 3/4.
|
|
*/
|
|
return p;
|
|
}
|
|
size = nbytes;
|
|
}
|
|
bp = PyObject_Malloc(nbytes);
|
|
if (bp != NULL) {
|
|
memcpy(bp, p, size);
|
|
PyObject_Free(p);
|
|
}
|
|
return bp;
|
|
}
|
|
/* We're not managing this block. If nbytes <=
|
|
* SMALL_REQUEST_THRESHOLD, it's tempting to try to take over this
|
|
* block. However, if we do, we need to copy the valid data from
|
|
* the C-managed block to one of our blocks, and there's no portable
|
|
* way to know how much of the memory space starting at p is valid.
|
|
* As bug 1185883 pointed out the hard way, it's possible that the
|
|
* C-managed block is "at the end" of allocated VM space, so that
|
|
* a memory fault can occur if we try to copy nbytes bytes starting
|
|
* at p. Instead we punt: let C continue to manage this block.
|
|
*/
|
|
if (nbytes)
|
|
return realloc(p, nbytes);
|
|
/* C doesn't define the result of realloc(p, 0) (it may or may not
|
|
* return NULL then), but Python's docs promise that nbytes==0 never
|
|
* returns NULL. We don't pass 0 to realloc(), to avoid that endcase
|
|
* to begin with. Even then, we can't be sure that realloc() won't
|
|
* return NULL.
|
|
*/
|
|
bp = realloc(p, 1);
|
|
return bp ? bp : p;
|
|
}
|
|
|
|
#else /* ! WITH_PYMALLOC */
|
|
|
|
/*==========================================================================*/
|
|
/* pymalloc not enabled: Redirect the entry points to malloc. These will
|
|
* only be used by extensions that are compiled with pymalloc enabled. */
|
|
|
|
void *
|
|
PyObject_Malloc(size_t n)
|
|
{
|
|
return PyMem_MALLOC(n);
|
|
}
|
|
|
|
void *
|
|
PyObject_Realloc(void *p, size_t n)
|
|
{
|
|
return PyMem_REALLOC(p, n);
|
|
}
|
|
|
|
void
|
|
PyObject_Free(void *p)
|
|
{
|
|
PyMem_FREE(p);
|
|
}
|
|
#endif /* WITH_PYMALLOC */
|
|
|
|
#ifdef PYMALLOC_DEBUG
|
|
/*==========================================================================*/
|
|
/* A x-platform debugging allocator. This doesn't manage memory directly,
|
|
* it wraps a real allocator, adding extra debugging info to the memory blocks.
|
|
*/
|
|
|
|
/* Special bytes broadcast into debug memory blocks at appropriate times.
|
|
* Strings of these are unlikely to be valid addresses, floats, ints or
|
|
* 7-bit ASCII.
|
|
*/
|
|
#undef CLEANBYTE
|
|
#undef DEADBYTE
|
|
#undef FORBIDDENBYTE
|
|
#define CLEANBYTE 0xCB /* clean (newly allocated) memory */
|
|
#define DEADBYTE 0xDB /* dead (newly freed) memory */
|
|
#define FORBIDDENBYTE 0xFB /* untouchable bytes at each end of a block */
|
|
|
|
static size_t serialno = 0; /* incremented on each debug {m,re}alloc */
|
|
|
|
/* serialno is always incremented via calling this routine. The point is
|
|
* to supply a single place to set a breakpoint.
|
|
*/
|
|
static void
|
|
bumpserialno(void)
|
|
{
|
|
++serialno;
|
|
}
|
|
|
|
#define SST SIZEOF_SIZE_T
|
|
|
|
/* Read sizeof(size_t) bytes at p as a big-endian size_t. */
|
|
static size_t
|
|
read_size_t(const void *p)
|
|
{
|
|
const uchar *q = (const uchar *)p;
|
|
size_t result = *q++;
|
|
int i;
|
|
|
|
for (i = SST; --i > 0; ++q)
|
|
result = (result << 8) | *q;
|
|
return result;
|
|
}
|
|
|
|
/* Write n as a big-endian size_t, MSB at address p, LSB at
|
|
* p + sizeof(size_t) - 1.
|
|
*/
|
|
static void
|
|
write_size_t(void *p, size_t n)
|
|
{
|
|
uchar *q = (uchar *)p + SST - 1;
|
|
int i;
|
|
|
|
for (i = SST; --i >= 0; --q) {
|
|
*q = (uchar)(n & 0xff);
|
|
n >>= 8;
|
|
}
|
|
}
|
|
|
|
#ifdef Py_DEBUG
|
|
/* Is target in the list? The list is traversed via the nextpool pointers.
|
|
* The list may be NULL-terminated, or circular. Return 1 if target is in
|
|
* list, else 0.
|
|
*/
|
|
static int
|
|
pool_is_in_list(const poolp target, poolp list)
|
|
{
|
|
poolp origlist = list;
|
|
assert(target != NULL);
|
|
if (list == NULL)
|
|
return 0;
|
|
do {
|
|
if (target == list)
|
|
return 1;
|
|
list = list->nextpool;
|
|
} while (list != NULL && list != origlist);
|
|
return 0;
|
|
}
|
|
|
|
#else
|
|
#define pool_is_in_list(X, Y) 1
|
|
|
|
#endif /* Py_DEBUG */
|
|
|
|
/* Let S = sizeof(size_t). The debug malloc asks for 4*S extra bytes and
|
|
fills them with useful stuff, here calling the underlying malloc's result p:
|
|
|
|
p[0: S]
|
|
Number of bytes originally asked for. This is a size_t, big-endian (easier
|
|
to read in a memory dump).
|
|
p[S: 2*S]
|
|
Copies of FORBIDDENBYTE. Used to catch under- writes and reads.
|
|
p[2*S: 2*S+n]
|
|
The requested memory, filled with copies of CLEANBYTE.
|
|
Used to catch reference to uninitialized memory.
|
|
&p[2*S] is returned. Note that this is 8-byte aligned if pymalloc
|
|
handled the request itself.
|
|
p[2*S+n: 2*S+n+S]
|
|
Copies of FORBIDDENBYTE. Used to catch over- writes and reads.
|
|
p[2*S+n+S: 2*S+n+2*S]
|
|
A serial number, incremented by 1 on each call to _PyObject_DebugMalloc
|
|
and _PyObject_DebugRealloc.
|
|
This is a big-endian size_t.
|
|
If "bad memory" is detected later, the serial number gives an
|
|
excellent way to set a breakpoint on the next run, to capture the
|
|
instant at which this block was passed out.
|
|
*/
|
|
|
|
void *
|
|
_PyObject_DebugMalloc(size_t nbytes)
|
|
{
|
|
uchar *p; /* base address of malloc'ed block */
|
|
uchar *tail; /* p + 2*SST + nbytes == pointer to tail pad bytes */
|
|
size_t total; /* nbytes + 4*SST */
|
|
|
|
bumpserialno();
|
|
total = nbytes + 4*SST;
|
|
if (total < nbytes)
|
|
/* overflow: can't represent total as a size_t */
|
|
return NULL;
|
|
|
|
p = (uchar *)PyObject_Malloc(total);
|
|
if (p == NULL)
|
|
return NULL;
|
|
|
|
write_size_t(p, nbytes);
|
|
memset(p + SST, FORBIDDENBYTE, SST);
|
|
|
|
if (nbytes > 0)
|
|
memset(p + 2*SST, CLEANBYTE, nbytes);
|
|
|
|
tail = p + 2*SST + nbytes;
|
|
memset(tail, FORBIDDENBYTE, SST);
|
|
write_size_t(tail + SST, serialno);
|
|
|
|
return p + 2*SST;
|
|
}
|
|
|
|
/* The debug free first checks the 2*SST bytes on each end for sanity (in
|
|
particular, that the FORBIDDENBYTEs are still intact).
|
|
Then fills the original bytes with DEADBYTE.
|
|
Then calls the underlying free.
|
|
*/
|
|
void
|
|
_PyObject_DebugFree(void *p)
|
|
{
|
|
uchar *q = (uchar *)p - 2*SST; /* address returned from malloc */
|
|
size_t nbytes;
|
|
|
|
if (p == NULL)
|
|
return;
|
|
_PyObject_DebugCheckAddress(p);
|
|
nbytes = read_size_t(q);
|
|
if (nbytes > 0)
|
|
memset(q, DEADBYTE, nbytes);
|
|
PyObject_Free(q);
|
|
}
|
|
|
|
void *
|
|
_PyObject_DebugRealloc(void *p, size_t nbytes)
|
|
{
|
|
uchar *q = (uchar *)p;
|
|
uchar *tail;
|
|
size_t total; /* nbytes + 4*SST */
|
|
size_t original_nbytes;
|
|
int i;
|
|
|
|
if (p == NULL)
|
|
return _PyObject_DebugMalloc(nbytes);
|
|
|
|
_PyObject_DebugCheckAddress(p);
|
|
bumpserialno();
|
|
original_nbytes = read_size_t(q - 2*SST);
|
|
total = nbytes + 4*SST;
|
|
if (total < nbytes)
|
|
/* overflow: can't represent total as a size_t */
|
|
return NULL;
|
|
|
|
if (nbytes < original_nbytes) {
|
|
/* shrinking: mark old extra memory dead */
|
|
memset(q + nbytes, DEADBYTE, original_nbytes - nbytes);
|
|
}
|
|
|
|
/* Resize and add decorations. */
|
|
q = (uchar *)PyObject_Realloc(q - 2*SST, total);
|
|
if (q == NULL)
|
|
return NULL;
|
|
|
|
write_size_t(q, nbytes);
|
|
for (i = 0; i < SST; ++i)
|
|
assert(q[SST + i] == FORBIDDENBYTE);
|
|
q += 2*SST;
|
|
tail = q + nbytes;
|
|
memset(tail, FORBIDDENBYTE, SST);
|
|
write_size_t(tail + SST, serialno);
|
|
|
|
if (nbytes > original_nbytes) {
|
|
/* growing: mark new extra memory clean */
|
|
memset(q + original_nbytes, CLEANBYTE,
|
|
nbytes - original_nbytes);
|
|
}
|
|
|
|
return q;
|
|
}
|
|
|
|
/* Check the forbidden bytes on both ends of the memory allocated for p.
|
|
* If anything is wrong, print info to stderr via _PyObject_DebugDumpAddress,
|
|
* and call Py_FatalError to kill the program.
|
|
*/
|
|
void
|
|
_PyObject_DebugCheckAddress(const void *p)
|
|
{
|
|
const uchar *q = (const uchar *)p;
|
|
char *msg;
|
|
size_t nbytes;
|
|
const uchar *tail;
|
|
int i;
|
|
|
|
if (p == NULL) {
|
|
msg = "didn't expect a NULL pointer";
|
|
goto error;
|
|
}
|
|
|
|
/* Check the stuff at the start of p first: if there's underwrite
|
|
* corruption, the number-of-bytes field may be nuts, and checking
|
|
* the tail could lead to a segfault then.
|
|
*/
|
|
for (i = SST; i >= 1; --i) {
|
|
if (*(q-i) != FORBIDDENBYTE) {
|
|
msg = "bad leading pad byte";
|
|
goto error;
|
|
}
|
|
}
|
|
|
|
nbytes = read_size_t(q - 2*SST);
|
|
tail = q + nbytes;
|
|
for (i = 0; i < SST; ++i) {
|
|
if (tail[i] != FORBIDDENBYTE) {
|
|
msg = "bad trailing pad byte";
|
|
goto error;
|
|
}
|
|
}
|
|
|
|
return;
|
|
|
|
error:
|
|
_PyObject_DebugDumpAddress(p);
|
|
Py_FatalError(msg);
|
|
}
|
|
|
|
/* Display info to stderr about the memory block at p. */
|
|
void
|
|
_PyObject_DebugDumpAddress(const void *p)
|
|
{
|
|
const uchar *q = (const uchar *)p;
|
|
const uchar *tail;
|
|
size_t nbytes, serial;
|
|
int i;
|
|
int ok;
|
|
|
|
fprintf(stderr, "Debug memory block at address p=%p:\n", p);
|
|
if (p == NULL)
|
|
return;
|
|
|
|
nbytes = read_size_t(q - 2*SST);
|
|
fprintf(stderr, " %" PY_FORMAT_SIZE_T "u bytes originally "
|
|
"requested\n", nbytes);
|
|
|
|
/* In case this is nuts, check the leading pad bytes first. */
|
|
fprintf(stderr, " The %d pad bytes at p-%d are ", SST, SST);
|
|
ok = 1;
|
|
for (i = 1; i <= SST; ++i) {
|
|
if (*(q-i) != FORBIDDENBYTE) {
|
|
ok = 0;
|
|
break;
|
|
}
|
|
}
|
|
if (ok)
|
|
fputs("FORBIDDENBYTE, as expected.\n", stderr);
|
|
else {
|
|
fprintf(stderr, "not all FORBIDDENBYTE (0x%02x):\n",
|
|
FORBIDDENBYTE);
|
|
for (i = SST; i >= 1; --i) {
|
|
const uchar byte = *(q-i);
|
|
fprintf(stderr, " at p-%d: 0x%02x", i, byte);
|
|
if (byte != FORBIDDENBYTE)
|
|
fputs(" *** OUCH", stderr);
|
|
fputc('\n', stderr);
|
|
}
|
|
|
|
fputs(" Because memory is corrupted at the start, the "
|
|
"count of bytes requested\n"
|
|
" may be bogus, and checking the trailing pad "
|
|
"bytes may segfault.\n", stderr);
|
|
}
|
|
|
|
tail = q + nbytes;
|
|
fprintf(stderr, " The %d pad bytes at tail=%p are ", SST, tail);
|
|
ok = 1;
|
|
for (i = 0; i < SST; ++i) {
|
|
if (tail[i] != FORBIDDENBYTE) {
|
|
ok = 0;
|
|
break;
|
|
}
|
|
}
|
|
if (ok)
|
|
fputs("FORBIDDENBYTE, as expected.\n", stderr);
|
|
else {
|
|
fprintf(stderr, "not all FORBIDDENBYTE (0x%02x):\n",
|
|
FORBIDDENBYTE);
|
|
for (i = 0; i < SST; ++i) {
|
|
const uchar byte = tail[i];
|
|
fprintf(stderr, " at tail+%d: 0x%02x",
|
|
i, byte);
|
|
if (byte != FORBIDDENBYTE)
|
|
fputs(" *** OUCH", stderr);
|
|
fputc('\n', stderr);
|
|
}
|
|
}
|
|
|
|
serial = read_size_t(tail + SST);
|
|
fprintf(stderr, " The block was made by call #%" PY_FORMAT_SIZE_T
|
|
"u to debug malloc/realloc.\n", serial);
|
|
|
|
if (nbytes > 0) {
|
|
i = 0;
|
|
fputs(" Data at p:", stderr);
|
|
/* print up to 8 bytes at the start */
|
|
while (q < tail && i < 8) {
|
|
fprintf(stderr, " %02x", *q);
|
|
++i;
|
|
++q;
|
|
}
|
|
/* and up to 8 at the end */
|
|
if (q < tail) {
|
|
if (tail - q > 8) {
|
|
fputs(" ...", stderr);
|
|
q = tail - 8;
|
|
}
|
|
while (q < tail) {
|
|
fprintf(stderr, " %02x", *q);
|
|
++q;
|
|
}
|
|
}
|
|
fputc('\n', stderr);
|
|
}
|
|
}
|
|
|
|
static size_t
|
|
printone(const char* msg, size_t value)
|
|
{
|
|
int i, k;
|
|
char buf[100];
|
|
size_t origvalue = value;
|
|
|
|
fputs(msg, stderr);
|
|
for (i = (int)strlen(msg); i < 35; ++i)
|
|
fputc(' ', stderr);
|
|
fputc('=', stderr);
|
|
|
|
/* Write the value with commas. */
|
|
i = 22;
|
|
buf[i--] = '\0';
|
|
buf[i--] = '\n';
|
|
k = 3;
|
|
do {
|
|
size_t nextvalue = value / 10;
|
|
uint digit = (uint)(value - nextvalue * 10);
|
|
value = nextvalue;
|
|
buf[i--] = (char)(digit + '0');
|
|
--k;
|
|
if (k == 0 && value && i >= 0) {
|
|
k = 3;
|
|
buf[i--] = ',';
|
|
}
|
|
} while (value && i >= 0);
|
|
|
|
while (i >= 0)
|
|
buf[i--] = ' ';
|
|
fputs(buf, stderr);
|
|
|
|
return origvalue;
|
|
}
|
|
|
|
/* Print summary info to stderr about the state of pymalloc's structures.
|
|
* In Py_DEBUG mode, also perform some expensive internal consistency
|
|
* checks.
|
|
*/
|
|
void
|
|
_PyObject_DebugMallocStats(void)
|
|
{
|
|
uint i;
|
|
const uint numclasses = SMALL_REQUEST_THRESHOLD >> ALIGNMENT_SHIFT;
|
|
/* # of pools, allocated blocks, and free blocks per class index */
|
|
size_t numpools[SMALL_REQUEST_THRESHOLD >> ALIGNMENT_SHIFT];
|
|
size_t numblocks[SMALL_REQUEST_THRESHOLD >> ALIGNMENT_SHIFT];
|
|
size_t numfreeblocks[SMALL_REQUEST_THRESHOLD >> ALIGNMENT_SHIFT];
|
|
/* total # of allocated bytes in used and full pools */
|
|
size_t allocated_bytes = 0;
|
|
/* total # of available bytes in used pools */
|
|
size_t available_bytes = 0;
|
|
/* # of free pools + pools not yet carved out of current arena */
|
|
uint numfreepools = 0;
|
|
/* # of bytes for arena alignment padding */
|
|
size_t arena_alignment = 0;
|
|
/* # of bytes in used and full pools used for pool_headers */
|
|
size_t pool_header_bytes = 0;
|
|
/* # of bytes in used and full pools wasted due to quantization,
|
|
* i.e. the necessarily leftover space at the ends of used and
|
|
* full pools.
|
|
*/
|
|
size_t quantization = 0;
|
|
/* # of arenas actually allocated. */
|
|
size_t narenas = 0;
|
|
/* running total -- should equal narenas * ARENA_SIZE */
|
|
size_t total;
|
|
char buf[128];
|
|
|
|
fprintf(stderr, "Small block threshold = %d, in %u size classes.\n",
|
|
SMALL_REQUEST_THRESHOLD, numclasses);
|
|
|
|
for (i = 0; i < numclasses; ++i)
|
|
numpools[i] = numblocks[i] = numfreeblocks[i] = 0;
|
|
|
|
/* Because full pools aren't linked to from anything, it's easiest
|
|
* to march over all the arenas. If we're lucky, most of the memory
|
|
* will be living in full pools -- would be a shame to miss them.
|
|
*/
|
|
for (i = 0; i < maxarenas; ++i) {
|
|
uint poolsinarena;
|
|
uint j;
|
|
uptr base = arenas[i].address;
|
|
|
|
/* Skip arenas which are not allocated. */
|
|
if (arenas[i].address == (uptr)NULL)
|
|
continue;
|
|
narenas += 1;
|
|
|
|
poolsinarena = arenas[i].ntotalpools;
|
|
numfreepools += arenas[i].nfreepools;
|
|
|
|
/* round up to pool alignment */
|
|
if (base & (uptr)POOL_SIZE_MASK) {
|
|
arena_alignment += POOL_SIZE;
|
|
base &= ~(uptr)POOL_SIZE_MASK;
|
|
base += POOL_SIZE;
|
|
}
|
|
|
|
/* visit every pool in the arena */
|
|
assert(base <= (uptr) arenas[i].pool_address);
|
|
for (j = 0;
|
|
base < (uptr) arenas[i].pool_address;
|
|
++j, base += POOL_SIZE) {
|
|
poolp p = (poolp)base;
|
|
const uint sz = p->szidx;
|
|
uint freeblocks;
|
|
|
|
if (p->ref.count == 0) {
|
|
/* currently unused */
|
|
assert(pool_is_in_list(p, arenas[i].freepools));
|
|
continue;
|
|
}
|
|
++numpools[sz];
|
|
numblocks[sz] += p->ref.count;
|
|
freeblocks = NUMBLOCKS(sz) - p->ref.count;
|
|
numfreeblocks[sz] += freeblocks;
|
|
#ifdef Py_DEBUG
|
|
if (freeblocks > 0)
|
|
assert(pool_is_in_list(p, usedpools[sz + sz]));
|
|
#endif
|
|
}
|
|
}
|
|
assert(narenas == narenas_currently_allocated);
|
|
|
|
fputc('\n', stderr);
|
|
fputs("class size num pools blocks in use avail blocks\n"
|
|
"----- ---- --------- ------------- ------------\n",
|
|
stderr);
|
|
|
|
for (i = 0; i < numclasses; ++i) {
|
|
size_t p = numpools[i];
|
|
size_t b = numblocks[i];
|
|
size_t f = numfreeblocks[i];
|
|
uint size = INDEX2SIZE(i);
|
|
if (p == 0) {
|
|
assert(b == 0 && f == 0);
|
|
continue;
|
|
}
|
|
fprintf(stderr, "%5u %6u "
|
|
"%11" PY_FORMAT_SIZE_T "u "
|
|
"%15" PY_FORMAT_SIZE_T "u "
|
|
"%13" PY_FORMAT_SIZE_T "u\n",
|
|
i, size, p, b, f);
|
|
allocated_bytes += b * size;
|
|
available_bytes += f * size;
|
|
pool_header_bytes += p * POOL_OVERHEAD;
|
|
quantization += p * ((POOL_SIZE - POOL_OVERHEAD) % size);
|
|
}
|
|
fputc('\n', stderr);
|
|
(void)printone("# times object malloc called", serialno);
|
|
|
|
(void)printone("# arenas allocated total", ntimes_arena_allocated);
|
|
(void)printone("# arenas reclaimed", ntimes_arena_allocated - narenas);
|
|
(void)printone("# arenas highwater mark", narenas_highwater);
|
|
(void)printone("# arenas allocated current", narenas);
|
|
|
|
PyOS_snprintf(buf, sizeof(buf),
|
|
"%" PY_FORMAT_SIZE_T "u arenas * %d bytes/arena",
|
|
narenas, ARENA_SIZE);
|
|
(void)printone(buf, narenas * ARENA_SIZE);
|
|
|
|
fputc('\n', stderr);
|
|
|
|
total = printone("# bytes in allocated blocks", allocated_bytes);
|
|
total += printone("# bytes in available blocks", available_bytes);
|
|
|
|
PyOS_snprintf(buf, sizeof(buf),
|
|
"%u unused pools * %d bytes", numfreepools, POOL_SIZE);
|
|
total += printone(buf, (size_t)numfreepools * POOL_SIZE);
|
|
|
|
total += printone("# bytes lost to pool headers", pool_header_bytes);
|
|
total += printone("# bytes lost to quantization", quantization);
|
|
total += printone("# bytes lost to arena alignment", arena_alignment);
|
|
(void)printone("Total", total);
|
|
}
|
|
|
|
#endif /* PYMALLOC_DEBUG */
|
|
|
|
#ifdef Py_USING_MEMORY_DEBUGGER
|
|
/* Make this function last so gcc won't inline it since the definition is
|
|
* after the reference.
|
|
*/
|
|
int
|
|
Py_ADDRESS_IN_RANGE(void *P, poolp pool)
|
|
{
|
|
return pool->arenaindex < maxarenas &&
|
|
(uptr)P - arenas[pool->arenaindex].address < (uptr)ARENA_SIZE &&
|
|
arenas[pool->arenaindex].address != 0;
|
|
}
|
|
#endif
|