mirror of
https://github.com/python/cpython.git
synced 2024-12-11 18:53:56 +08:00
8ce8a784bd
svn+ssh://pythondev@svn.python.org/python/trunk ........ r58221 | georg.brandl | 2007-09-20 10:57:59 -0700 (Thu, 20 Sep 2007) | 2 lines Patch #1181: add os.environ.clear() method. ........ r58225 | sean.reifschneider | 2007-09-20 23:33:28 -0700 (Thu, 20 Sep 2007) | 3 lines Issue1704287: "make install" fails unless you do "make" first. Make oldsharedmods and sharedmods in "libinstall". ........ r58232 | guido.van.rossum | 2007-09-22 13:18:03 -0700 (Sat, 22 Sep 2007) | 4 lines Patch # 188 by Philip Jenvey. Make tell() mark CRLF as a newline. With unit test. ........ r58242 | georg.brandl | 2007-09-24 10:55:47 -0700 (Mon, 24 Sep 2007) | 2 lines Fix typo and double word. ........ r58245 | georg.brandl | 2007-09-24 10:59:28 -0700 (Mon, 24 Sep 2007) | 2 lines #1196: document default radix for int(). ........ r58247 | georg.brandl | 2007-09-24 11:08:24 -0700 (Mon, 24 Sep 2007) | 2 lines #1177: accept 2xx responses for https too, not only http. ........ r58249 | andrew.kuchling | 2007-09-24 16:45:51 -0700 (Mon, 24 Sep 2007) | 1 line Remove stray odd character; grammar fix ........ r58250 | andrew.kuchling | 2007-09-24 16:46:28 -0700 (Mon, 24 Sep 2007) | 1 line Typo fix ........ r58251 | andrew.kuchling | 2007-09-24 17:09:42 -0700 (Mon, 24 Sep 2007) | 1 line Add various items ........ r58268 | vinay.sajip | 2007-09-26 22:34:45 -0700 (Wed, 26 Sep 2007) | 1 line Change to flush and close logic to fix #1760556. ........ r58269 | vinay.sajip | 2007-09-26 22:38:51 -0700 (Wed, 26 Sep 2007) | 1 line Change to basicConfig() to fix #1021. ........ r58270 | georg.brandl | 2007-09-26 23:26:58 -0700 (Wed, 26 Sep 2007) | 2 lines #1208: document match object's boolean value. ........ r58271 | vinay.sajip | 2007-09-26 23:56:13 -0700 (Wed, 26 Sep 2007) | 1 line Minor date change. ........ r58272 | vinay.sajip | 2007-09-27 00:35:10 -0700 (Thu, 27 Sep 2007) | 1 line Change to LogRecord.__init__() to fix #1206. Note that archaic use of type(x) == types.DictType is because of keeping 1.5.2 compatibility. While this is much less relevant these days, there probably needs to be a separate commit for removing all archaic constructs at the same time. ........ r58288 | brett.cannon | 2007-09-30 12:45:10 -0700 (Sun, 30 Sep 2007) | 9 lines tuple.__repr__ did not consider a reference loop as it is not possible from Python code; but it is possible from C. object.__str__ had the issue of not expecting a type to doing something within it's tp_str implementation that could trigger an infinite recursion, but it could in C code.. Both found thanks to BaseException and how it handles its repr. Closes issue #1686386. Thanks to Thomas Herve for taking an initial stab at coming up with a solution. ........ r58289 | brett.cannon | 2007-09-30 13:37:19 -0700 (Sun, 30 Sep 2007) | 3 lines Fix error introduced by r58288; if a tuple is length 0 return its repr and don't worry about any self-referring tuples. ........ r58294 | facundo.batista | 2007-10-02 10:01:24 -0700 (Tue, 02 Oct 2007) | 11 lines Made the various is_* operations return booleans. This was discussed with Cawlishaw by mail, and he basically confirmed that to these is_* operations, there's no need to return Decimal(0) and Decimal(1) if the language supports the False and True booleans. Also added a few tests for the these functions in extra.decTest, since they are mostly untested (apart from the doctests). Thanks Mark Dickinson ........ r58295 | facundo.batista | 2007-10-02 11:21:18 -0700 (Tue, 02 Oct 2007) | 4 lines Added a class to store the digits of log(10), so that they can be made available when necessary without recomputing. Thanks Mark Dickinson ........ r58299 | mark.summerfield | 2007-10-03 01:53:21 -0700 (Wed, 03 Oct 2007) | 4 lines Added note in footnote about string comparisons about unicodedata.normalize(). ........ r58304 | raymond.hettinger | 2007-10-03 14:18:11 -0700 (Wed, 03 Oct 2007) | 1 line enumerate() is no longer bounded to using sequences shorter than LONG_MAX. The possibility of overflow was sending some newsgroup posters into a tizzy. ........ r58305 | raymond.hettinger | 2007-10-03 17:20:27 -0700 (Wed, 03 Oct 2007) | 1 line itertools.count() no longer limited to sys.maxint. ........ r58306 | kurt.kaiser | 2007-10-03 18:49:54 -0700 (Wed, 03 Oct 2007) | 3 lines Assume that the user knows when he wants to end the line; don't insert something he didn't select or complete. ........ r58307 | kurt.kaiser | 2007-10-03 19:07:50 -0700 (Wed, 03 Oct 2007) | 2 lines Remove unused theme that was causing a fault in p3k. ........ r58308 | kurt.kaiser | 2007-10-03 19:09:17 -0700 (Wed, 03 Oct 2007) | 2 lines Clean up EditorWindow close. ........ r58309 | kurt.kaiser | 2007-10-03 19:53:07 -0700 (Wed, 03 Oct 2007) | 7 lines textView cleanup. Patch 1718043 Tal Einat. M idlelib/EditorWindow.py M idlelib/aboutDialog.py M idlelib/textView.py M idlelib/NEWS.txt ........ r58310 | kurt.kaiser | 2007-10-03 20:11:12 -0700 (Wed, 03 Oct 2007) | 3 lines configDialog cleanup. Patch 1730217 Tal Einat. ........ r58311 | neal.norwitz | 2007-10-03 23:00:48 -0700 (Wed, 03 Oct 2007) | 4 lines Coverity #151: Remove deadcode. All this code already exists above starting at line 653. ........ r58325 | fred.drake | 2007-10-04 19:46:12 -0700 (Thu, 04 Oct 2007) | 1 line wrap lines to <80 characters before fixing errors ........ r58326 | raymond.hettinger | 2007-10-04 19:47:07 -0700 (Thu, 04 Oct 2007) | 6 lines Add __asdict__() to NamedTuple and refine the docs. Add maxlen support to deque() and fixup docs. Partially fix __reduce__(). The None as a third arg was no longer supported. Still needs work on __reduce__() to handle recursive inputs. ........ r58327 | fred.drake | 2007-10-04 19:48:32 -0700 (Thu, 04 Oct 2007) | 3 lines move descriptions of ac_(in|out)_buffer_size to the right place http://bugs.python.org/issue1053 ........ r58329 | neal.norwitz | 2007-10-04 20:39:17 -0700 (Thu, 04 Oct 2007) | 3 lines dict could be NULL, so we need to XDECREF. Fix a compiler warning about passing a PyTypeObject* instead of PyObject*. ........ r58330 | neal.norwitz | 2007-10-04 20:41:19 -0700 (Thu, 04 Oct 2007) | 2 lines Fix Coverity #158: Check the correct variable. ........ r58332 | neal.norwitz | 2007-10-04 22:01:38 -0700 (Thu, 04 Oct 2007) | 7 lines Fix Coverity #159. This code was broken if save() returned a negative number since i contained a boolean value and then we compared i < 0 which should never be true. Will backport (assuming it's necessary) ........ r58334 | neal.norwitz | 2007-10-04 22:29:17 -0700 (Thu, 04 Oct 2007) | 1 line Add a note about fixing some more warnings found by Coverity. ........ r58338 | raymond.hettinger | 2007-10-05 12:07:31 -0700 (Fri, 05 Oct 2007) | 1 line Restore BEGIN/END THREADS macros which were squashed in the previous checkin ........ r58343 | gregory.p.smith | 2007-10-06 00:48:10 -0700 (Sat, 06 Oct 2007) | 3 lines Stab in the dark attempt to fix the test_bsddb3 failure on sparc and S-390 ubuntu buildbots. ........ r58344 | gregory.p.smith | 2007-10-06 00:51:59 -0700 (Sat, 06 Oct 2007) | 2 lines Allows BerkeleyDB 4.6.x >= 4.6.21 for the bsddb module. ........ r58348 | gregory.p.smith | 2007-10-06 08:47:37 -0700 (Sat, 06 Oct 2007) | 3 lines Use the host the author likely meant in the first place. pop.gmail.com is reliable. gmail.org is someones personal domain. ........ r58351 | neal.norwitz | 2007-10-06 12:16:28 -0700 (Sat, 06 Oct 2007) | 3 lines Ensure that this test will pass even if another test left an unwritable TESTFN. Also use the safe unlink in test_support instead of rolling our own here. ........ r58368 | georg.brandl | 2007-10-08 00:50:24 -0700 (Mon, 08 Oct 2007) | 3 lines #1123: fix the docs for the str.split(None, sep) case. Also expand a few other methods' docs, which had more info in the deprecated string module docs. ........ r58369 | georg.brandl | 2007-10-08 01:06:05 -0700 (Mon, 08 Oct 2007) | 2 lines Update docstring of sched, also remove an unused assignment. ........ r58370 | raymond.hettinger | 2007-10-08 02:14:28 -0700 (Mon, 08 Oct 2007) | 5 lines Add comments to NamedTuple code. Let the field spec be either a string or a non-string sequence (suggested by Martin Blais with use cases). Improve the error message in the case of a SyntaxError (caused by a duplicate field name). ........ r58371 | raymond.hettinger | 2007-10-08 02:56:29 -0700 (Mon, 08 Oct 2007) | 1 line Missed a line in the docs ........ r58372 | raymond.hettinger | 2007-10-08 03:11:51 -0700 (Mon, 08 Oct 2007) | 1 line Better variable names ........ r58376 | georg.brandl | 2007-10-08 07:12:47 -0700 (Mon, 08 Oct 2007) | 3 lines #1199: docs for tp_as_{number,sequence,mapping}, by Amaury Forgeot d'Arc. No need to merge this to py3k! ........ r58380 | raymond.hettinger | 2007-10-08 14:26:58 -0700 (Mon, 08 Oct 2007) | 1 line Eliminate camelcase function name ........ r58381 | andrew.kuchling | 2007-10-08 16:23:03 -0700 (Mon, 08 Oct 2007) | 1 line Eliminate camelcase function name ........ r58382 | raymond.hettinger | 2007-10-08 18:36:23 -0700 (Mon, 08 Oct 2007) | 1 line Make the error messages more specific ........ r58384 | gregory.p.smith | 2007-10-08 23:02:21 -0700 (Mon, 08 Oct 2007) | 10 lines Splits Modules/_bsddb.c up into bsddb.h and _bsddb.c and adds a C API object available as bsddb.db.api. This is based on the patch submitted by Duncan Grisby here: http://sourceforge.net/tracker/index.php?func=detail&aid=1551895&group_id=13900&atid=313900 See this thread for additional info: http://sourceforge.net/mailarchive/forum.php?thread_name=E1GAVDK-0002rk-Iw%40apasphere.com&forum_name=pybsddb-users It also cleans up the code a little by removing some ifdef/endifs for python prior to 2.1 and for unsupported Berkeley DB <= 3.2. ........ r58385 | gregory.p.smith | 2007-10-08 23:50:43 -0700 (Mon, 08 Oct 2007) | 5 lines Fix a double free when positioning a database cursor to a non-existant string key (and probably a few other situations with string keys). This was reported with a patch as pybsddb sourceforge bug 1708868 by jjjhhhlll at gmail. ........ r58386 | gregory.p.smith | 2007-10-09 00:19:11 -0700 (Tue, 09 Oct 2007) | 3 lines Use the highest cPickle protocol in bsddb.dbshelve. This comes from sourceforge pybsddb patch 1551443 by w_barnes. ........ r58394 | gregory.p.smith | 2007-10-09 11:26:02 -0700 (Tue, 09 Oct 2007) | 2 lines remove another sleepycat reference ........ r58396 | kurt.kaiser | 2007-10-09 12:31:30 -0700 (Tue, 09 Oct 2007) | 3 lines Allow interrupt only when executing user code in subprocess Patch 1225 Tal Einat modified from IDLE-Spoon. ........ r58399 | brett.cannon | 2007-10-09 17:07:50 -0700 (Tue, 09 Oct 2007) | 5 lines Remove file-level typedefs that were inconsistently used throughout the file. Just move over to the public API names. Closes issue1238. ........ r58401 | raymond.hettinger | 2007-10-09 17:26:46 -0700 (Tue, 09 Oct 2007) | 1 line Accept Jim Jewett's api suggestion to use None instead of -1 to indicate unbounded deques. ........ r58403 | kurt.kaiser | 2007-10-09 17:55:40 -0700 (Tue, 09 Oct 2007) | 2 lines Allow cursor color change w/o restart. Patch 1725576 Tal Einat. ........ r58404 | kurt.kaiser | 2007-10-09 18:06:47 -0700 (Tue, 09 Oct 2007) | 2 lines show paste if > 80 columns. Patch 1659326 Tal Einat. ........ r58415 | thomas.heller | 2007-10-11 12:51:32 -0700 (Thu, 11 Oct 2007) | 5 lines On OS X, use os.uname() instead of gestalt.sysv(...) to get the operating system version. This allows to use ctypes when Python was configured with --disable-toolbox-glue. ........ r58419 | neal.norwitz | 2007-10-11 20:01:01 -0700 (Thu, 11 Oct 2007) | 1 line Get rid of warning about not being able to create an existing directory. ........ r58420 | neal.norwitz | 2007-10-11 20:01:30 -0700 (Thu, 11 Oct 2007) | 1 line Get rid of warnings on a bunch of platforms by using a proper prototype. ........ r58421 | neal.norwitz | 2007-10-11 20:01:54 -0700 (Thu, 11 Oct 2007) | 4 lines Get rid of compiler warning about retval being used (returned) without being initialized. (gcc warning and Coverity 202) ........ r58422 | neal.norwitz | 2007-10-11 20:03:23 -0700 (Thu, 11 Oct 2007) | 1 line Fix Coverity 168: Close the file before returning (exiting). ........ r58423 | neal.norwitz | 2007-10-11 20:04:18 -0700 (Thu, 11 Oct 2007) | 4 lines Fix Coverity 180: Don't overallocate. We don't need structs, but pointers. Also fix a memory leak. ........ r58424 | neal.norwitz | 2007-10-11 20:05:19 -0700 (Thu, 11 Oct 2007) | 5 lines Fix Coverity 185-186: If the passed in FILE is NULL, uninitialized memory would be accessed. Will backport. ........ r58425 | neal.norwitz | 2007-10-11 20:52:34 -0700 (Thu, 11 Oct 2007) | 1 line Get this module to compile with bsddb versions prior to 4.3 ........ r58430 | martin.v.loewis | 2007-10-12 01:56:52 -0700 (Fri, 12 Oct 2007) | 3 lines Bug #1216: Restore support for Visual Studio 2002. Will backport to 2.5. ........ r58433 | raymond.hettinger | 2007-10-12 10:53:11 -0700 (Fri, 12 Oct 2007) | 1 line Fix test of count.__repr__() to ignore the 'L' if the count is a long ........ r58434 | gregory.p.smith | 2007-10-12 11:44:06 -0700 (Fri, 12 Oct 2007) | 4 lines Fixes http://bugs.python.org/issue1233 - bsddb.dbshelve.DBShelf.append was useless due to inverted logic. Also adds a test case for RECNO dbs to test_dbshelve. ........ r58445 | georg.brandl | 2007-10-13 06:20:03 -0700 (Sat, 13 Oct 2007) | 2 lines Fix email example. ........ r58450 | gregory.p.smith | 2007-10-13 16:02:05 -0700 (Sat, 13 Oct 2007) | 2 lines Fix an uncollectable reference leak in bsddb.db.DBShelf.append ........ r58453 | neal.norwitz | 2007-10-13 17:18:40 -0700 (Sat, 13 Oct 2007) | 8 lines Let the O/S supply a port if none of the default ports can be used. This should make the tests more robust at the expense of allowing tests to be sloppier by not requiring them to cleanup after themselves. (It will legitamitely help when running two test suites simultaneously or if another process is already using one of the predefined ports.) Also simplifies (slightLy) the exception handling elsewhere. ........ r58459 | neal.norwitz | 2007-10-14 11:30:21 -0700 (Sun, 14 Oct 2007) | 2 lines Don't raise a string exception, they don't work anymore. ........ r58460 | neal.norwitz | 2007-10-14 11:40:37 -0700 (Sun, 14 Oct 2007) | 1 line Use unittest for assertions ........ r58468 | armin.rigo | 2007-10-15 00:48:35 -0700 (Mon, 15 Oct 2007) | 2 lines test_bigbits was not testing what it seemed to. ........ r58471 | guido.van.rossum | 2007-10-15 08:54:11 -0700 (Mon, 15 Oct 2007) | 3 lines Change a PyErr_Print() into a PyErr_Clear(), per discussion in issue 1031213. ........ r58500 | raymond.hettinger | 2007-10-16 12:18:30 -0700 (Tue, 16 Oct 2007) | 1 line Improve error messages ........ r58506 | raymond.hettinger | 2007-10-16 14:28:32 -0700 (Tue, 16 Oct 2007) | 1 line More docs, error messages, and tests ........ r58507 | andrew.kuchling | 2007-10-16 15:58:03 -0700 (Tue, 16 Oct 2007) | 1 line Add items ........ r58508 | brett.cannon | 2007-10-16 16:24:06 -0700 (Tue, 16 Oct 2007) | 3 lines Remove ``:const:`` notation on None in parameter list. Since the markup is not rendered for parameters it just showed up as ``:const:`None` `` in the output. ........ r58509 | brett.cannon | 2007-10-16 16:26:45 -0700 (Tue, 16 Oct 2007) | 3 lines Re-order some functions whose parameters differ between PyObject and const char * so that they are next to each other. ........ r58522 | armin.rigo | 2007-10-17 11:46:37 -0700 (Wed, 17 Oct 2007) | 5 lines Fix the overflow checking of list_repeat. Introduce overflow checking into list_inplace_repeat. Backport candidate, possibly. ........ r58530 | facundo.batista | 2007-10-17 20:16:03 -0700 (Wed, 17 Oct 2007) | 7 lines Issue #1580738. When HTTPConnection reads the whole stream with read(), it closes itself. When the stream is read in several calls to read(n), it should behave in the same way if HTTPConnection knows where the end of the stream is (through self.length). Added a test case for this behaviour. ........ r58531 | facundo.batista | 2007-10-17 20:44:48 -0700 (Wed, 17 Oct 2007) | 3 lines Issue 1289, just a typo. ........ r58532 | gregory.p.smith | 2007-10-18 00:56:54 -0700 (Thu, 18 Oct 2007) | 4 lines cleanup test_dbtables to use mkdtemp. cleanup dbtables to pass txn as a keyword argument whenever possible to avoid bugs and confusion. (dbtables.py line 447 self.db.get using txn as a non-keyword was an actual bug due to this) ........ r58533 | gregory.p.smith | 2007-10-18 01:34:20 -0700 (Thu, 18 Oct 2007) | 4 lines Fix a weird bug in dbtables: if it chose a random rowid string that contained NULL bytes it would cause the database all sorts of problems in the future leading to very strange random failures and corrupt dbtables.bsdTableDb dbs. ........ r58534 | gregory.p.smith | 2007-10-18 09:32:02 -0700 (Thu, 18 Oct 2007) | 3 lines A cleaner fix than the one committed last night. Generate random rowids that do not contain null bytes. ........ r58537 | gregory.p.smith | 2007-10-18 10:17:57 -0700 (Thu, 18 Oct 2007) | 2 lines mention bsddb fixes. ........ r58538 | raymond.hettinger | 2007-10-18 14:13:06 -0700 (Thu, 18 Oct 2007) | 1 line Remove useless warning ........ r58539 | gregory.p.smith | 2007-10-19 00:31:20 -0700 (Fri, 19 Oct 2007) | 2 lines squelch the warning that this test is supposed to trigger. ........ r58542 | georg.brandl | 2007-10-19 05:32:39 -0700 (Fri, 19 Oct 2007) | 2 lines Clarify wording for apply(). ........ r58544 | mark.summerfield | 2007-10-19 05:48:17 -0700 (Fri, 19 Oct 2007) | 3 lines Added a cross-ref to each other. ........ r58545 | georg.brandl | 2007-10-19 10:38:49 -0700 (Fri, 19 Oct 2007) | 2 lines #1284: "S" means "seen", not unread. ........ r58548 | thomas.heller | 2007-10-19 11:11:41 -0700 (Fri, 19 Oct 2007) | 4 lines Fix ctypes on 32-bit systems when Python is configured --with-system-ffi. See also https://bugs.launchpad.net/bugs/72505. Ported from release25-maint branch. ........ r58550 | facundo.batista | 2007-10-19 12:25:57 -0700 (Fri, 19 Oct 2007) | 8 lines The constructor from tuple was way too permissive: it allowed bad coefficient numbers, floats in the sign, and other details that generated directly the wrong number in the best case, or triggered misfunctionality in the alorithms. Test cases added for these issues. Thanks Mark Dickinson. ........ r58559 | georg.brandl | 2007-10-20 06:22:53 -0700 (Sat, 20 Oct 2007) | 2 lines Fix code being interpreted as a target. ........ r58561 | georg.brandl | 2007-10-20 06:36:24 -0700 (Sat, 20 Oct 2007) | 2 lines Document new "cmdoption" directive. ........ r58562 | georg.brandl | 2007-10-20 08:21:22 -0700 (Sat, 20 Oct 2007) | 2 lines Make a path more Unix-standardy. ........ r58564 | georg.brandl | 2007-10-20 10:51:39 -0700 (Sat, 20 Oct 2007) | 2 lines Document new directive "envvar". ........ r58567 | georg.brandl | 2007-10-20 11:08:14 -0700 (Sat, 20 Oct 2007) | 6 lines * Add new toplevel chapter, "Using Python." (how to install, configure and setup python on different platforms -- at least in theory.) * Move the Python on Mac docs in that chapter. * Add a new chapter about the command line invocation, by stargaming. ........ r58568 | georg.brandl | 2007-10-20 11:33:20 -0700 (Sat, 20 Oct 2007) | 2 lines Change title, for now. ........ r58569 | georg.brandl | 2007-10-20 11:39:25 -0700 (Sat, 20 Oct 2007) | 2 lines Add entry to ACKS. ........ r58570 | georg.brandl | 2007-10-20 12:05:45 -0700 (Sat, 20 Oct 2007) | 2 lines Clarify -E docs. ........ r58571 | georg.brandl | 2007-10-20 12:08:36 -0700 (Sat, 20 Oct 2007) | 2 lines Even more clarification. ........ r58572 | andrew.kuchling | 2007-10-20 12:25:37 -0700 (Sat, 20 Oct 2007) | 1 line Fix protocol name ........ r58573 | andrew.kuchling | 2007-10-20 12:35:18 -0700 (Sat, 20 Oct 2007) | 1 line Various items ........ r58574 | andrew.kuchling | 2007-10-20 12:39:35 -0700 (Sat, 20 Oct 2007) | 1 line Use correct header line ........ r58576 | armin.rigo | 2007-10-21 02:14:15 -0700 (Sun, 21 Oct 2007) | 3 lines Add a crasher for the long-standing issue with closing a file while another thread uses it. ........ r58577 | georg.brandl | 2007-10-21 03:01:56 -0700 (Sun, 21 Oct 2007) | 2 lines Remove duplicate crasher. ........ r58578 | georg.brandl | 2007-10-21 03:24:20 -0700 (Sun, 21 Oct 2007) | 2 lines Unify "byte code" to "bytecode". Also sprinkle :term: markup for it. ........ r58579 | georg.brandl | 2007-10-21 03:32:54 -0700 (Sun, 21 Oct 2007) | 2 lines Add markup to new function descriptions. ........ r58580 | georg.brandl | 2007-10-21 03:45:46 -0700 (Sun, 21 Oct 2007) | 2 lines Add :term:s for descriptors. ........ r58581 | georg.brandl | 2007-10-21 03:46:24 -0700 (Sun, 21 Oct 2007) | 2 lines Unify "file-descriptor" to "file descriptor". ........ r58582 | georg.brandl | 2007-10-21 03:52:38 -0700 (Sun, 21 Oct 2007) | 2 lines Add :term: for generators. ........ r58583 | georg.brandl | 2007-10-21 05:10:28 -0700 (Sun, 21 Oct 2007) | 2 lines Add :term:s for iterator. ........ r58584 | georg.brandl | 2007-10-21 05:15:05 -0700 (Sun, 21 Oct 2007) | 2 lines Add :term:s for "new-style class". ........ r58588 | neal.norwitz | 2007-10-21 21:47:54 -0700 (Sun, 21 Oct 2007) | 1 line Add Chris Monson so he can edit PEPs. ........ r58594 | guido.van.rossum | 2007-10-22 09:27:19 -0700 (Mon, 22 Oct 2007) | 4 lines Issue #1307, patch by Derek Shockey. When "MAIL" is received without args, an exception happens instead of sending a 501 syntax error response. ........ r58598 | travis.oliphant | 2007-10-22 19:40:56 -0700 (Mon, 22 Oct 2007) | 1 line Add phuang patch from Issue 708374 which adds offset parameter to mmap module. ........ r58601 | neal.norwitz | 2007-10-22 22:44:27 -0700 (Mon, 22 Oct 2007) | 2 lines Bug #1313, fix typo (wrong variable name) in example. ........ r58609 | georg.brandl | 2007-10-23 11:21:35 -0700 (Tue, 23 Oct 2007) | 2 lines Update Pygments version from externals. ........ r58618 | guido.van.rossum | 2007-10-23 12:25:41 -0700 (Tue, 23 Oct 2007) | 3 lines Issue 1307 by Derek Shockey, fox the same bug for RCPT. Neal: please backport! ........ r58620 | raymond.hettinger | 2007-10-23 13:37:41 -0700 (Tue, 23 Oct 2007) | 1 line Shorter name for namedtuple() ........ r58621 | andrew.kuchling | 2007-10-23 13:55:47 -0700 (Tue, 23 Oct 2007) | 1 line Update name ........ r58622 | raymond.hettinger | 2007-10-23 14:23:07 -0700 (Tue, 23 Oct 2007) | 1 line Fixup news entry ........ r58623 | raymond.hettinger | 2007-10-23 18:28:33 -0700 (Tue, 23 Oct 2007) | 1 line Optimize sum() for integer and float inputs. ........ r58624 | raymond.hettinger | 2007-10-23 19:05:51 -0700 (Tue, 23 Oct 2007) | 1 line Fixup error return and add support for intermixed ints and floats/ ........ r58628 | vinay.sajip | 2007-10-24 03:47:06 -0700 (Wed, 24 Oct 2007) | 1 line Bug #1321: Fixed logic error in TimedRotatingFileHandler.__init__() ........ r58641 | facundo.batista | 2007-10-24 12:11:08 -0700 (Wed, 24 Oct 2007) | 4 lines Issue 1290. CharacterData.__repr__ was constructing a string in response that keeped having a non-ascii character. ........ r58643 | thomas.heller | 2007-10-24 12:50:45 -0700 (Wed, 24 Oct 2007) | 1 line Added unittest for calling a function with paramflags (backport from py3k branch). ........ r58645 | matthias.klose | 2007-10-24 13:00:44 -0700 (Wed, 24 Oct 2007) | 2 lines - Build using system ffi library on arm*-linux*. ........ r58651 | georg.brandl | 2007-10-24 14:40:38 -0700 (Wed, 24 Oct 2007) | 2 lines Bug #1287: make os.environ.pop() work as expected. ........ r58652 | raymond.hettinger | 2007-10-24 19:26:58 -0700 (Wed, 24 Oct 2007) | 1 line Missing DECREFs ........ r58653 | matthias.klose | 2007-10-24 23:37:24 -0700 (Wed, 24 Oct 2007) | 2 lines - Build using system ffi library on arm*-linux*, pass --with-system-ffi to CONFIG_ARGS ........ r58655 | thomas.heller | 2007-10-25 12:47:32 -0700 (Thu, 25 Oct 2007) | 2 lines ffi_type_longdouble may be already #defined. See issue 1324. ........ r58656 | kurt.kaiser | 2007-10-25 15:43:45 -0700 (Thu, 25 Oct 2007) | 3 lines Correct an ancient bug in an unused path by removing that path: register() is now idempotent. ........ r58660 | kurt.kaiser | 2007-10-25 17:10:09 -0700 (Thu, 25 Oct 2007) | 4 lines 1. Add comments to provide top-level documentation. 2. Refactor to use more descriptive names. 3. Enhance tests in main(). ........ r58675 | georg.brandl | 2007-10-26 11:30:41 -0700 (Fri, 26 Oct 2007) | 2 lines Fix new pop() method on os.environ on ignorecase-platforms. ........ r58696 | neal.norwitz | 2007-10-27 15:32:21 -0700 (Sat, 27 Oct 2007) | 1 line Update URL for Pygments. 0.8.1 is no longer available ........ r58697 | hyeshik.chang | 2007-10-28 04:19:02 -0700 (Sun, 28 Oct 2007) | 3 lines - Add support for FreeBSD 8 which is recently forked from FreeBSD 7. - Regenerate IN module for most recent maintenance tree of FreeBSD 6 and 7. ........ r58698 | hyeshik.chang | 2007-10-28 05:38:09 -0700 (Sun, 28 Oct 2007) | 2 lines Enable platform-specific tweaks for FreeBSD 8 (exactly same to FreeBSD 7's yet) ........ r58700 | kurt.kaiser | 2007-10-28 12:03:59 -0700 (Sun, 28 Oct 2007) | 2 lines Add confirmation dialog before printing. Patch 1717170 Tal Einat. ........ r58706 | guido.van.rossum | 2007-10-29 13:52:45 -0700 (Mon, 29 Oct 2007) | 3 lines Patch 1353 by Jacob Winther. Add mp4 mapping to mimetypes.py. ........ r58709 | guido.van.rossum | 2007-10-29 15:15:05 -0700 (Mon, 29 Oct 2007) | 6 lines Backport fixes for the code that decodes octal escapes (and for PyString also hex escapes) -- this was reaching beyond the end of the input string buffer, even though it is not supposed to be \0-terminated. This has no visible effect but is clearly the correct thing to do. (In 3.0 it had a visible effect after removing ob_sstate from PyString.) ........ r58710 | kurt.kaiser | 2007-10-29 19:38:54 -0700 (Mon, 29 Oct 2007) | 7 lines check in Tal Einat's update to tabpage.py Patch 1612746 M configDialog.py M NEWS.txt AM tabbedpages.py ........ r58715 | georg.brandl | 2007-10-30 10:51:18 -0700 (Tue, 30 Oct 2007) | 2 lines Use correct markup. ........ r58716 | georg.brandl | 2007-10-30 10:57:12 -0700 (Tue, 30 Oct 2007) | 2 lines Make example about hiding None return values at the prompt clearer. ........ r58728 | neal.norwitz | 2007-10-30 23:33:20 -0700 (Tue, 30 Oct 2007) | 1 line Fix some compiler warnings for signed comparisons on Unix and Windows. ........ r58731 | martin.v.loewis | 2007-10-31 10:19:33 -0700 (Wed, 31 Oct 2007) | 2 lines Adding Christian Heimes. ........ r58737 | raymond.hettinger | 2007-10-31 14:57:58 -0700 (Wed, 31 Oct 2007) | 1 line Clarify the reasons why pickle is almost always better than marshal ........ r58739 | raymond.hettinger | 2007-10-31 15:15:49 -0700 (Wed, 31 Oct 2007) | 1 line Sets are marshalable. ........
1300 lines
31 KiB
C
1300 lines
31 KiB
C
/*
|
|
/ Author: Sam Rushing <rushing@nightmare.com>
|
|
/ Hacked for Unix by AMK
|
|
/ $Id$
|
|
|
|
/ Modified to support mmap with offset - to map a 'window' of a file
|
|
/ Author: Yotam Medini yotamm@mellanox.co.il
|
|
/
|
|
/ mmapmodule.cpp -- map a view of a file into memory
|
|
/
|
|
/ todo: need permission flags, perhaps a 'chsize' analog
|
|
/ not all functions check range yet!!!
|
|
/
|
|
/
|
|
/ This version of mmapmodule.c has been changed significantly
|
|
/ from the original mmapfile.c on which it was based.
|
|
/ The original version of mmapfile is maintained by Sam at
|
|
/ ftp://squirl.nightmare.com/pub/python/python-ext.
|
|
*/
|
|
|
|
#define PY_SSIZE_T_CLEAN
|
|
#include <Python.h>
|
|
|
|
#ifndef MS_WINDOWS
|
|
#define UNIX
|
|
#endif
|
|
|
|
#ifdef MS_WINDOWS
|
|
#include <windows.h>
|
|
static int
|
|
my_getpagesize(void)
|
|
{
|
|
SYSTEM_INFO si;
|
|
GetSystemInfo(&si);
|
|
return si.dwPageSize;
|
|
}
|
|
|
|
static int
|
|
my_getallocationgranularity (void)
|
|
{
|
|
|
|
SYSTEM_INFO si;
|
|
GetSystemInfo(&si);
|
|
return si.dwAllocationGranularity;
|
|
}
|
|
|
|
#endif
|
|
|
|
#ifdef UNIX
|
|
#include <sys/mman.h>
|
|
#include <sys/stat.h>
|
|
|
|
#if defined(HAVE_SYSCONF) && defined(_SC_PAGESIZE)
|
|
static int
|
|
my_getpagesize(void)
|
|
{
|
|
return sysconf(_SC_PAGESIZE);
|
|
}
|
|
|
|
#define my_getallocationgranularity my_getpagesize
|
|
#else
|
|
#define my_getpagesize getpagesize
|
|
#endif
|
|
|
|
#endif /* UNIX */
|
|
|
|
#include <string.h>
|
|
|
|
#ifdef HAVE_SYS_TYPES_H
|
|
#include <sys/types.h>
|
|
#endif /* HAVE_SYS_TYPES_H */
|
|
|
|
/* Prefer MAP_ANONYMOUS since MAP_ANON is deprecated according to man page. */
|
|
#if !defined(MAP_ANONYMOUS) && defined(MAP_ANON)
|
|
# define MAP_ANONYMOUS MAP_ANON
|
|
#endif
|
|
|
|
static PyObject *mmap_module_error;
|
|
|
|
typedef enum
|
|
{
|
|
ACCESS_DEFAULT,
|
|
ACCESS_READ,
|
|
ACCESS_WRITE,
|
|
ACCESS_COPY
|
|
} access_mode;
|
|
|
|
typedef struct {
|
|
PyObject_HEAD
|
|
char * data;
|
|
size_t size;
|
|
size_t pos; /* relative to offset */
|
|
size_t offset;
|
|
int exports;
|
|
|
|
#ifdef MS_WINDOWS
|
|
HANDLE map_handle;
|
|
HANDLE file_handle;
|
|
char * tagname;
|
|
#endif
|
|
|
|
#ifdef UNIX
|
|
int fd;
|
|
#endif
|
|
|
|
access_mode access;
|
|
} mmap_object;
|
|
|
|
|
|
static void
|
|
mmap_object_dealloc(mmap_object *m_obj)
|
|
{
|
|
#ifdef MS_WINDOWS
|
|
if (m_obj->data != NULL)
|
|
UnmapViewOfFile (m_obj->data);
|
|
if (m_obj->map_handle != INVALID_HANDLE_VALUE)
|
|
CloseHandle (m_obj->map_handle);
|
|
if (m_obj->file_handle != INVALID_HANDLE_VALUE)
|
|
CloseHandle (m_obj->file_handle);
|
|
if (m_obj->tagname)
|
|
PyMem_Free(m_obj->tagname);
|
|
#endif /* MS_WINDOWS */
|
|
|
|
#ifdef UNIX
|
|
if (m_obj->fd >= 0)
|
|
(void) close(m_obj->fd);
|
|
if (m_obj->data!=NULL) {
|
|
msync(m_obj->data, m_obj->size, MS_SYNC);
|
|
munmap(m_obj->data, m_obj->size);
|
|
}
|
|
#endif /* UNIX */
|
|
|
|
PyObject_Del(m_obj);
|
|
}
|
|
|
|
static PyObject *
|
|
mmap_close_method(mmap_object *self, PyObject *unused)
|
|
{
|
|
if (self->exports > 0) {
|
|
PyErr_SetString(PyExc_BufferError, "cannot close "\
|
|
"exported pointers exist");
|
|
return NULL;
|
|
}
|
|
#ifdef MS_WINDOWS
|
|
/* For each resource we maintain, we need to check
|
|
the value is valid, and if so, free the resource
|
|
and set the member value to an invalid value so
|
|
the dealloc does not attempt to resource clearing
|
|
again.
|
|
TODO - should we check for errors in the close operations???
|
|
*/
|
|
if (self->data != NULL) {
|
|
UnmapViewOfFile(self->data);
|
|
self->data = NULL;
|
|
}
|
|
if (self->map_handle != INVALID_HANDLE_VALUE) {
|
|
CloseHandle(self->map_handle);
|
|
self->map_handle = INVALID_HANDLE_VALUE;
|
|
}
|
|
if (self->file_handle != INVALID_HANDLE_VALUE) {
|
|
CloseHandle(self->file_handle);
|
|
self->file_handle = INVALID_HANDLE_VALUE;
|
|
}
|
|
#endif /* MS_WINDOWS */
|
|
|
|
#ifdef UNIX
|
|
(void) close(self->fd);
|
|
self->fd = -1;
|
|
if (self->data != NULL) {
|
|
munmap(self->data, self->size);
|
|
self->data = NULL;
|
|
}
|
|
#endif
|
|
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
|
|
#ifdef MS_WINDOWS
|
|
#define CHECK_VALID(err) \
|
|
do { \
|
|
if (self->map_handle == INVALID_HANDLE_VALUE) { \
|
|
PyErr_SetString(PyExc_ValueError, "mmap closed or invalid"); \
|
|
return err; \
|
|
} \
|
|
} while (0)
|
|
#endif /* MS_WINDOWS */
|
|
|
|
#ifdef UNIX
|
|
#define CHECK_VALID(err) \
|
|
do { \
|
|
if (self->data == NULL) { \
|
|
PyErr_SetString(PyExc_ValueError, "mmap closed or invalid"); \
|
|
return err; \
|
|
} \
|
|
} while (0)
|
|
#endif /* UNIX */
|
|
|
|
static PyObject *
|
|
mmap_read_byte_method(mmap_object *self,
|
|
PyObject *unused)
|
|
{
|
|
CHECK_VALID(NULL);
|
|
if (self->pos < self->size) {
|
|
char value = self->data[self->pos];
|
|
self->pos += 1;
|
|
return Py_BuildValue("c", value);
|
|
} else {
|
|
PyErr_SetString(PyExc_ValueError, "read byte out of range");
|
|
return NULL;
|
|
}
|
|
}
|
|
|
|
static PyObject *
|
|
mmap_read_line_method(mmap_object *self,
|
|
PyObject *unused)
|
|
{
|
|
char *start = self->data+self->pos;
|
|
char *eof = self->data+self->size;
|
|
char *eol;
|
|
PyObject *result;
|
|
|
|
CHECK_VALID(NULL);
|
|
|
|
eol = memchr(start, '\n', self->size - self->pos);
|
|
if (!eol)
|
|
eol = eof;
|
|
else
|
|
++eol; /* we're interested in the position after the
|
|
newline. */
|
|
result = PyBytes_FromStringAndSize(start, (eol - start));
|
|
self->pos += (eol - start);
|
|
return result;
|
|
}
|
|
|
|
static PyObject *
|
|
mmap_read_method(mmap_object *self,
|
|
PyObject *args)
|
|
{
|
|
Py_ssize_t num_bytes;
|
|
PyObject *result;
|
|
|
|
CHECK_VALID(NULL);
|
|
if (!PyArg_ParseTuple(args, "n:read", &num_bytes))
|
|
return(NULL);
|
|
|
|
/* silently 'adjust' out-of-range requests */
|
|
if ((self->pos + num_bytes) > self->size) {
|
|
num_bytes -= (self->pos+num_bytes) - self->size;
|
|
}
|
|
result = PyBytes_FromStringAndSize(self->data+self->pos, num_bytes);
|
|
self->pos += num_bytes;
|
|
return result;
|
|
}
|
|
|
|
static PyObject *
|
|
mmap_find_method(mmap_object *self,
|
|
PyObject *args)
|
|
{
|
|
Py_ssize_t start = self->pos;
|
|
char *needle;
|
|
Py_ssize_t len;
|
|
|
|
CHECK_VALID(NULL);
|
|
if (!PyArg_ParseTuple(args, "s#|n:find", &needle, &len, &start)) {
|
|
return NULL;
|
|
} else {
|
|
char *p;
|
|
char *e = self->data + self->size;
|
|
|
|
if (start < 0)
|
|
start += self->size;
|
|
if (start < 0)
|
|
start = 0;
|
|
else if ((size_t)start > self->size)
|
|
start = self->size;
|
|
|
|
for (p = self->data + start; p + len <= e; ++p) {
|
|
Py_ssize_t i;
|
|
for (i = 0; i < len && needle[i] == p[i]; ++i)
|
|
/* nothing */;
|
|
if (i == len) {
|
|
return PyInt_FromSsize_t(p - self->data);
|
|
}
|
|
}
|
|
return PyInt_FromLong(-1);
|
|
}
|
|
}
|
|
|
|
static int
|
|
is_writable(mmap_object *self)
|
|
{
|
|
if (self->access != ACCESS_READ)
|
|
return 1;
|
|
PyErr_Format(PyExc_TypeError, "mmap can't modify a readonly memory map.");
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
is_resizeable(mmap_object *self)
|
|
{
|
|
if (self->exports > 0) {
|
|
PyErr_SetString(PyExc_BufferError,
|
|
"mmap can't resize with extant buffers exported.");
|
|
return 0;
|
|
}
|
|
if ((self->access == ACCESS_WRITE) || (self->access == ACCESS_DEFAULT))
|
|
return 1;
|
|
PyErr_Format(PyExc_TypeError,
|
|
"mmap can't resize a readonly or copy-on-write memory map.");
|
|
return 0;
|
|
}
|
|
|
|
|
|
static PyObject *
|
|
mmap_write_method(mmap_object *self,
|
|
PyObject *args)
|
|
{
|
|
Py_ssize_t length;
|
|
char *data;
|
|
|
|
CHECK_VALID(NULL);
|
|
if (!PyArg_ParseTuple(args, "s#:write", &data, &length))
|
|
return(NULL);
|
|
|
|
if (!is_writable(self))
|
|
return NULL;
|
|
|
|
if ((self->pos + length) > self->size) {
|
|
PyErr_SetString(PyExc_ValueError, "data out of range");
|
|
return NULL;
|
|
}
|
|
memcpy(self->data+self->pos, data, length);
|
|
self->pos = self->pos+length;
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
|
|
static PyObject *
|
|
mmap_write_byte_method(mmap_object *self,
|
|
PyObject *args)
|
|
{
|
|
char value;
|
|
|
|
CHECK_VALID(NULL);
|
|
if (!PyArg_ParseTuple(args, "c:write_byte", &value))
|
|
return(NULL);
|
|
|
|
if (!is_writable(self))
|
|
return NULL;
|
|
*(self->data+self->pos) = value;
|
|
self->pos += 1;
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
|
|
static PyObject *
|
|
mmap_size_method(mmap_object *self,
|
|
PyObject *unused)
|
|
{
|
|
CHECK_VALID(NULL);
|
|
|
|
#ifdef MS_WINDOWS
|
|
if (self->file_handle != INVALID_HANDLE_VALUE) {
|
|
DWORD low,high;
|
|
PY_LONG_LONG size;
|
|
low = GetFileSize(self->file_handle, &high);
|
|
if (low == INVALID_FILE_SIZE) {
|
|
/* It might be that the function appears to have failed,
|
|
when indeed its size equals INVALID_FILE_SIZE */
|
|
DWORD error = GetLastError();
|
|
if (error != NO_ERROR)
|
|
return PyErr_SetFromWindowsErr(error);
|
|
}
|
|
if (!high && low < LONG_MAX)
|
|
return PyInt_FromLong((long)low);
|
|
size = (((PY_LONG_LONG)high)<<32) + low;
|
|
return PyLong_FromLongLong(size);
|
|
} else {
|
|
return PyInt_FromSsize_t(self->size);
|
|
}
|
|
#endif /* MS_WINDOWS */
|
|
|
|
#ifdef UNIX
|
|
{
|
|
struct stat buf;
|
|
if (-1 == fstat(self->fd, &buf)) {
|
|
PyErr_SetFromErrno(mmap_module_error);
|
|
return NULL;
|
|
}
|
|
return PyInt_FromSsize_t(buf.st_size);
|
|
}
|
|
#endif /* UNIX */
|
|
}
|
|
|
|
/* This assumes that you want the entire file mapped,
|
|
/ and when recreating the map will make the new file
|
|
/ have the new size
|
|
/
|
|
/ Is this really necessary? This could easily be done
|
|
/ from python by just closing and re-opening with the
|
|
/ new size?
|
|
*/
|
|
|
|
static PyObject *
|
|
mmap_resize_method(mmap_object *self,
|
|
PyObject *args)
|
|
{
|
|
Py_ssize_t new_size;
|
|
CHECK_VALID(NULL);
|
|
if (!PyArg_ParseTuple(args, "n:resize", &new_size) ||
|
|
!is_resizeable(self)) {
|
|
return NULL;
|
|
#ifdef MS_WINDOWS
|
|
} else {
|
|
DWORD dwErrCode = 0;
|
|
DWORD off_hi, off_lo, newSizeLow, newSizeHigh;
|
|
/* First, unmap the file view */
|
|
UnmapViewOfFile(self->data);
|
|
/* Close the mapping object */
|
|
CloseHandle(self->map_handle);
|
|
/* Move to the desired EOF position */
|
|
#if SIZEOF_SIZE_T > 4
|
|
newSizeHigh = (DWORD)((self->offset + new_size) >> 32);
|
|
newSizeLow = (DWORD)((self->offset + new_size) & 0xFFFFFFFF);
|
|
off_hi = (DWORD)(self->offset >> 32);
|
|
off_lo = (DWORD)(self->offset & 0xFFFFFFFF);
|
|
#else
|
|
newSizeHigh = 0;
|
|
newSizeLow = (DWORD)new_size;
|
|
off_hi = 0;
|
|
off_lo = (DWORD)self->offset;
|
|
#endif
|
|
SetFilePointer(self->file_handle,
|
|
newSizeLow, &newSizeHigh, FILE_BEGIN);
|
|
/* Change the size of the file */
|
|
SetEndOfFile(self->file_handle);
|
|
/* Create another mapping object and remap the file view */
|
|
self->map_handle = CreateFileMapping(
|
|
self->file_handle,
|
|
NULL,
|
|
PAGE_READWRITE,
|
|
0,
|
|
0,
|
|
self->tagname);
|
|
if (self->map_handle != NULL) {
|
|
self->data = (char *) MapViewOfFile(self->map_handle,
|
|
FILE_MAP_WRITE,
|
|
off_hi,
|
|
off_lo,
|
|
new_size);
|
|
if (self->data != NULL) {
|
|
self->size = new_size;
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
} else {
|
|
dwErrCode = GetLastError();
|
|
}
|
|
} else {
|
|
dwErrCode = GetLastError();
|
|
}
|
|
PyErr_SetFromWindowsErr(dwErrCode);
|
|
return NULL;
|
|
#endif /* MS_WINDOWS */
|
|
|
|
#ifdef UNIX
|
|
#ifndef HAVE_MREMAP
|
|
} else {
|
|
PyErr_SetString(PyExc_SystemError,
|
|
"mmap: resizing not available--no mremap()");
|
|
return NULL;
|
|
#else
|
|
} else {
|
|
void *newmap;
|
|
|
|
if (ftruncate(self->fd, new_size) == -1) {
|
|
PyErr_SetFromErrno(mmap_module_error);
|
|
return NULL;
|
|
}
|
|
|
|
#ifdef MREMAP_MAYMOVE
|
|
newmap = mremap(self->data, self->size, new_size, MREMAP_MAYMOVE);
|
|
#else
|
|
newmap = mremap(self->data, self->size, new_size, 0);
|
|
#endif
|
|
if (newmap == (void *)-1)
|
|
{
|
|
PyErr_SetFromErrno(mmap_module_error);
|
|
return NULL;
|
|
}
|
|
self->data = newmap;
|
|
self->size = new_size;
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
#endif /* HAVE_MREMAP */
|
|
#endif /* UNIX */
|
|
}
|
|
}
|
|
|
|
static PyObject *
|
|
mmap_tell_method(mmap_object *self, PyObject *unused)
|
|
{
|
|
CHECK_VALID(NULL);
|
|
return PyInt_FromSize_t(self->pos);
|
|
}
|
|
|
|
static PyObject *
|
|
mmap_flush_method(mmap_object *self, PyObject *args)
|
|
{
|
|
Py_ssize_t offset = 0;
|
|
Py_ssize_t size = self->size;
|
|
CHECK_VALID(NULL);
|
|
if (!PyArg_ParseTuple(args, "|nn:flush", &offset, &size))
|
|
return NULL;
|
|
if ((size_t)(offset + size) > self->size) {
|
|
PyErr_SetString(PyExc_ValueError, "flush values out of range");
|
|
return NULL;
|
|
} else {
|
|
#ifdef MS_WINDOWS
|
|
return PyInt_FromLong((long)
|
|
FlushViewOfFile(self->data+offset, size));
|
|
#endif /* MS_WINDOWS */
|
|
#ifdef UNIX
|
|
/* XXX semantics of return value? */
|
|
/* XXX flags for msync? */
|
|
if (-1 == msync(self->data + offset, size,
|
|
MS_SYNC))
|
|
{
|
|
PyErr_SetFromErrno(mmap_module_error);
|
|
return NULL;
|
|
}
|
|
return PyInt_FromLong(0);
|
|
#endif /* UNIX */
|
|
}
|
|
}
|
|
|
|
static PyObject *
|
|
mmap_seek_method(mmap_object *self, PyObject *args)
|
|
{
|
|
Py_ssize_t dist;
|
|
int how=0;
|
|
CHECK_VALID(NULL);
|
|
if (!PyArg_ParseTuple(args, "n|i:seek", &dist, &how))
|
|
return NULL;
|
|
else {
|
|
size_t where;
|
|
switch (how) {
|
|
case 0: /* relative to start */
|
|
if (dist < 0)
|
|
goto onoutofrange;
|
|
where = dist;
|
|
break;
|
|
case 1: /* relative to current position */
|
|
if ((Py_ssize_t)self->pos + dist < 0)
|
|
goto onoutofrange;
|
|
where = self->pos + dist;
|
|
break;
|
|
case 2: /* relative to end */
|
|
if ((Py_ssize_t)self->size + dist < 0)
|
|
goto onoutofrange;
|
|
where = self->size + dist;
|
|
break;
|
|
default:
|
|
PyErr_SetString(PyExc_ValueError, "unknown seek type");
|
|
return NULL;
|
|
}
|
|
if (where > self->size)
|
|
goto onoutofrange;
|
|
self->pos = where;
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
|
|
onoutofrange:
|
|
PyErr_SetString(PyExc_ValueError, "seek out of range");
|
|
return NULL;
|
|
}
|
|
|
|
static PyObject *
|
|
mmap_move_method(mmap_object *self, PyObject *args)
|
|
{
|
|
unsigned long dest, src, count;
|
|
CHECK_VALID(NULL);
|
|
if (!PyArg_ParseTuple(args, "kkk:move", &dest, &src, &count) ||
|
|
!is_writable(self)) {
|
|
return NULL;
|
|
} else {
|
|
/* bounds check the values */
|
|
if (/* end of source after end of data?? */
|
|
((src+count) > self->size)
|
|
/* dest will fit? */
|
|
|| (dest+count > self->size)) {
|
|
PyErr_SetString(PyExc_ValueError,
|
|
"source or destination out of range");
|
|
return NULL;
|
|
} else {
|
|
memmove(self->data+dest, self->data+src, count);
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
}
|
|
}
|
|
|
|
static struct PyMethodDef mmap_object_methods[] = {
|
|
{"close", (PyCFunction) mmap_close_method, METH_NOARGS},
|
|
{"find", (PyCFunction) mmap_find_method, METH_VARARGS},
|
|
{"flush", (PyCFunction) mmap_flush_method, METH_VARARGS},
|
|
{"move", (PyCFunction) mmap_move_method, METH_VARARGS},
|
|
{"read", (PyCFunction) mmap_read_method, METH_VARARGS},
|
|
{"read_byte", (PyCFunction) mmap_read_byte_method, METH_NOARGS},
|
|
{"readline", (PyCFunction) mmap_read_line_method, METH_NOARGS},
|
|
{"resize", (PyCFunction) mmap_resize_method, METH_VARARGS},
|
|
{"seek", (PyCFunction) mmap_seek_method, METH_VARARGS},
|
|
{"size", (PyCFunction) mmap_size_method, METH_NOARGS},
|
|
{"tell", (PyCFunction) mmap_tell_method, METH_NOARGS},
|
|
{"write", (PyCFunction) mmap_write_method, METH_VARARGS},
|
|
{"write_byte", (PyCFunction) mmap_write_byte_method, METH_VARARGS},
|
|
{NULL, NULL} /* sentinel */
|
|
};
|
|
|
|
/* Functions for treating an mmap'ed file as a buffer */
|
|
|
|
static int
|
|
mmap_buffer_getbuf(mmap_object *self, Py_buffer *view, int flags)
|
|
{
|
|
CHECK_VALID(-1);
|
|
if (PyBuffer_FillInfo(view, self->data, self->size,
|
|
(self->access == ACCESS_READ), flags) < 0)
|
|
return -1;
|
|
self->exports++;
|
|
return 0;
|
|
}
|
|
|
|
static void
|
|
mmap_buffer_releasebuf(mmap_object *self, Py_buffer *view)
|
|
{
|
|
self->exports--;
|
|
}
|
|
|
|
static PyObject *
|
|
mmap_object_getattr(mmap_object *self, char *name)
|
|
{
|
|
return Py_FindMethod(mmap_object_methods, (PyObject *)self, name);
|
|
}
|
|
|
|
static Py_ssize_t
|
|
mmap_length(mmap_object *self)
|
|
{
|
|
CHECK_VALID(-1);
|
|
return self->size;
|
|
}
|
|
|
|
static PyObject *
|
|
mmap_item(mmap_object *self, Py_ssize_t i)
|
|
{
|
|
CHECK_VALID(NULL);
|
|
if (i < 0 || (size_t)i >= self->size) {
|
|
PyErr_SetString(PyExc_IndexError, "mmap index out of range");
|
|
return NULL;
|
|
}
|
|
return PyBytes_FromStringAndSize(self->data + i, 1);
|
|
}
|
|
|
|
static PyObject *
|
|
mmap_subscript(mmap_object *self, PyObject *item)
|
|
{
|
|
CHECK_VALID(NULL);
|
|
if (PyIndex_Check(item)) {
|
|
Py_ssize_t i = PyNumber_AsSsize_t(item, PyExc_IndexError);
|
|
if (i == -1 && PyErr_Occurred())
|
|
return NULL;
|
|
if (i < 0)
|
|
i += self->size;
|
|
if (i < 0 || (size_t)i > self->size) {
|
|
PyErr_SetString(PyExc_IndexError,
|
|
"mmap index out of range");
|
|
return NULL;
|
|
}
|
|
return PyBytes_FromStringAndSize(self->data + i, 1);
|
|
}
|
|
else if (PySlice_Check(item)) {
|
|
Py_ssize_t start, stop, step, slicelen;
|
|
|
|
if (PySlice_GetIndicesEx((PySliceObject *)item, self->size,
|
|
&start, &stop, &step, &slicelen) < 0) {
|
|
return NULL;
|
|
}
|
|
|
|
if (slicelen <= 0)
|
|
return PyBytes_FromStringAndSize("", 0);
|
|
else if (step == 1)
|
|
return PyBytes_FromStringAndSize(self->data + start,
|
|
slicelen);
|
|
else {
|
|
char *result_buf = (char *)PyMem_Malloc(slicelen);
|
|
Py_ssize_t cur, i;
|
|
PyObject *result;
|
|
|
|
if (result_buf == NULL)
|
|
return PyErr_NoMemory();
|
|
for (cur = start, i = 0; i < slicelen;
|
|
cur += step, i++) {
|
|
result_buf[i] = self->data[cur];
|
|
}
|
|
result = PyBytes_FromStringAndSize(result_buf,
|
|
slicelen);
|
|
PyMem_Free(result_buf);
|
|
return result;
|
|
}
|
|
}
|
|
else {
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"mmap indices must be integers");
|
|
return NULL;
|
|
}
|
|
}
|
|
|
|
static PyObject *
|
|
mmap_concat(mmap_object *self, PyObject *bb)
|
|
{
|
|
CHECK_VALID(NULL);
|
|
PyErr_SetString(PyExc_SystemError,
|
|
"mmaps don't support concatenation");
|
|
return NULL;
|
|
}
|
|
|
|
static PyObject *
|
|
mmap_repeat(mmap_object *self, Py_ssize_t n)
|
|
{
|
|
CHECK_VALID(NULL);
|
|
PyErr_SetString(PyExc_SystemError,
|
|
"mmaps don't support repeat operation");
|
|
return NULL;
|
|
}
|
|
|
|
static int
|
|
mmap_ass_item(mmap_object *self, Py_ssize_t i, PyObject *v)
|
|
{
|
|
const char *buf;
|
|
|
|
CHECK_VALID(-1);
|
|
if (i < 0 || (size_t)i >= self->size) {
|
|
PyErr_SetString(PyExc_IndexError, "mmap index out of range");
|
|
return -1;
|
|
}
|
|
if (v == NULL) {
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"mmap object doesn't support item deletion");
|
|
return -1;
|
|
}
|
|
if (! (PyBytes_Check(v) && PyBytes_Size(v)==1) ) {
|
|
PyErr_SetString(PyExc_IndexError,
|
|
"mmap assignment must be length-1 bytes()");
|
|
return -1;
|
|
}
|
|
if (!is_writable(self))
|
|
return -1;
|
|
buf = PyBytes_AsString(v);
|
|
self->data[i] = buf[0];
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
mmap_ass_subscript(mmap_object *self, PyObject *item, PyObject *value)
|
|
{
|
|
CHECK_VALID(-1);
|
|
|
|
if (PyIndex_Check(item)) {
|
|
Py_ssize_t i = PyNumber_AsSsize_t(item, PyExc_IndexError);
|
|
const char *buf;
|
|
|
|
if (i == -1 && PyErr_Occurred())
|
|
return -1;
|
|
if (i < 0)
|
|
i += self->size;
|
|
if (i < 0 || (size_t)i > self->size) {
|
|
PyErr_SetString(PyExc_IndexError,
|
|
"mmap index out of range");
|
|
return -1;
|
|
}
|
|
if (value == NULL) {
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"mmap object doesn't support item deletion");
|
|
return -1;
|
|
}
|
|
if (!PyBytes_Check(value) || PyBytes_Size(value) != 1) {
|
|
PyErr_SetString(PyExc_IndexError,
|
|
"mmap assignment must be length-1 bytes()");
|
|
return -1;
|
|
}
|
|
if (!is_writable(self))
|
|
return -1;
|
|
buf = PyBytes_AsString(value);
|
|
self->data[i] = buf[0];
|
|
return 0;
|
|
}
|
|
else if (PySlice_Check(item)) {
|
|
Py_ssize_t start, stop, step, slicelen;
|
|
|
|
if (PySlice_GetIndicesEx((PySliceObject *)item,
|
|
self->size, &start, &stop,
|
|
&step, &slicelen) < 0) {
|
|
return -1;
|
|
}
|
|
if (value == NULL) {
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"mmap object doesn't support slice deletion");
|
|
return -1;
|
|
}
|
|
if (!PyBytes_Check(value)) {
|
|
PyErr_SetString(PyExc_IndexError,
|
|
"mmap slice assignment must be bytes");
|
|
return -1;
|
|
}
|
|
if (PyBytes_Size(value) != slicelen) {
|
|
PyErr_SetString(PyExc_IndexError,
|
|
"mmap slice assignment is wrong size");
|
|
return -1;
|
|
}
|
|
if (!is_writable(self))
|
|
return -1;
|
|
|
|
if (slicelen == 0)
|
|
return 0;
|
|
else if (step == 1) {
|
|
const char *buf = PyBytes_AsString(value);
|
|
|
|
if (buf == NULL)
|
|
return -1;
|
|
memcpy(self->data + start, buf, slicelen);
|
|
return 0;
|
|
}
|
|
else {
|
|
Py_ssize_t cur, i;
|
|
const char *buf = PyBytes_AsString(value);
|
|
|
|
if (buf == NULL)
|
|
return -1;
|
|
for (cur = start, i = 0; i < slicelen;
|
|
cur += step, i++) {
|
|
self->data[cur] = buf[i];
|
|
}
|
|
return 0;
|
|
}
|
|
}
|
|
else {
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"mmap indices must be integer");
|
|
return -1;
|
|
}
|
|
}
|
|
|
|
static PySequenceMethods mmap_as_sequence = {
|
|
(lenfunc)mmap_length, /*sq_length*/
|
|
(binaryfunc)mmap_concat, /*sq_concat*/
|
|
(ssizeargfunc)mmap_repeat, /*sq_repeat*/
|
|
(ssizeargfunc)mmap_item, /*sq_item*/
|
|
0, /*sq_slice*/
|
|
(ssizeobjargproc)mmap_ass_item, /*sq_ass_item*/
|
|
0, /*sq_ass_slice*/
|
|
};
|
|
|
|
static PyMappingMethods mmap_as_mapping = {
|
|
(lenfunc)mmap_length,
|
|
(binaryfunc)mmap_subscript,
|
|
(objobjargproc)mmap_ass_subscript,
|
|
};
|
|
|
|
static PyBufferProcs mmap_as_buffer = {
|
|
(getbufferproc)mmap_buffer_getbuf,
|
|
(releasebufferproc)mmap_buffer_releasebuf,
|
|
};
|
|
|
|
static PyTypeObject mmap_object_type = {
|
|
PyVarObject_HEAD_INIT(0, 0) /* patched in module init */
|
|
"mmap.mmap", /* tp_name */
|
|
sizeof(mmap_object), /* tp_size */
|
|
0, /* tp_itemsize */
|
|
/* methods */
|
|
(destructor) mmap_object_dealloc, /* tp_dealloc */
|
|
0, /* tp_print */
|
|
(getattrfunc) mmap_object_getattr, /* tp_getattr */
|
|
0, /* tp_setattr */
|
|
0, /* tp_compare */
|
|
0, /* tp_repr */
|
|
0, /* tp_as_number */
|
|
&mmap_as_sequence, /*tp_as_sequence*/
|
|
&mmap_as_mapping, /*tp_as_mapping*/
|
|
0, /*tp_hash*/
|
|
0, /*tp_call*/
|
|
0, /*tp_str*/
|
|
0, /*tp_getattro*/
|
|
0, /*tp_setattro*/
|
|
&mmap_as_buffer, /*tp_as_buffer*/
|
|
Py_TPFLAGS_DEFAULT, /*tp_flags*/
|
|
0, /*tp_doc*/
|
|
};
|
|
|
|
|
|
/* extract the map size from the given PyObject
|
|
|
|
Returns -1 on error, with an appropriate Python exception raised. On
|
|
success, the map size is returned. */
|
|
static Py_ssize_t
|
|
_GetMapSize(PyObject *o, const char* param)
|
|
{
|
|
if (o == NULL)
|
|
return 0;
|
|
if (PyIndex_Check(o)) {
|
|
Py_ssize_t i = PyNumber_AsSsize_t(o, PyExc_OverflowError);
|
|
if (i==-1 && PyErr_Occurred())
|
|
return -1;
|
|
if (i < 0) {
|
|
PyErr_Format(PyExc_OverflowError,
|
|
"memory mapped %s must be positive",
|
|
param);
|
|
return -1;
|
|
}
|
|
return i;
|
|
}
|
|
|
|
PyErr_SetString(PyExc_TypeError, "map size must be an integral value");
|
|
return -1;
|
|
}
|
|
|
|
#ifdef UNIX
|
|
static PyObject *
|
|
new_mmap_object(PyObject *self, PyObject *args, PyObject *kwdict)
|
|
{
|
|
#ifdef HAVE_FSTAT
|
|
struct stat st;
|
|
#endif
|
|
mmap_object *m_obj;
|
|
PyObject *map_size_obj = NULL, *offset_obj = NULL;
|
|
Py_ssize_t map_size, offset;
|
|
int fd, flags = MAP_SHARED, prot = PROT_WRITE | PROT_READ;
|
|
int devzero = -1;
|
|
int access = (int)ACCESS_DEFAULT;
|
|
static char *keywords[] = {"fileno", "length",
|
|
"flags", "prot",
|
|
"access", "offset", NULL};
|
|
|
|
if (!PyArg_ParseTupleAndKeywords(args, kwdict, "iO|iiiO", keywords,
|
|
&fd, &map_size_obj, &flags, &prot,
|
|
&access, &offset_obj))
|
|
return NULL;
|
|
map_size = _GetMapSize(map_size_obj, "size");
|
|
if (map_size < 0)
|
|
return NULL;
|
|
offset = _GetMapSize(offset_obj, "offset");
|
|
if (offset < 0)
|
|
return NULL;
|
|
|
|
if ((access != (int)ACCESS_DEFAULT) &&
|
|
((flags != MAP_SHARED) || (prot != (PROT_WRITE | PROT_READ))))
|
|
return PyErr_Format(PyExc_ValueError,
|
|
"mmap can't specify both access and flags, prot.");
|
|
switch ((access_mode)access) {
|
|
case ACCESS_READ:
|
|
flags = MAP_SHARED;
|
|
prot = PROT_READ;
|
|
break;
|
|
case ACCESS_WRITE:
|
|
flags = MAP_SHARED;
|
|
prot = PROT_READ | PROT_WRITE;
|
|
break;
|
|
case ACCESS_COPY:
|
|
flags = MAP_PRIVATE;
|
|
prot = PROT_READ | PROT_WRITE;
|
|
break;
|
|
case ACCESS_DEFAULT:
|
|
/* use the specified or default values of flags and prot */
|
|
break;
|
|
default:
|
|
return PyErr_Format(PyExc_ValueError,
|
|
"mmap invalid access parameter.");
|
|
}
|
|
|
|
#ifdef HAVE_FSTAT
|
|
# ifdef __VMS
|
|
/* on OpenVMS we must ensure that all bytes are written to the file */
|
|
fsync(fd);
|
|
# endif
|
|
if (fstat(fd, &st) == 0 && S_ISREG(st.st_mode)) {
|
|
if (map_size == 0) {
|
|
map_size = st.st_size;
|
|
} else if ((size_t)offset + (size_t)map_size > st.st_size) {
|
|
PyErr_SetString(PyExc_ValueError,
|
|
"mmap length is greater than file size");
|
|
return NULL;
|
|
}
|
|
}
|
|
#endif
|
|
m_obj = PyObject_New(mmap_object, &mmap_object_type);
|
|
if (m_obj == NULL) {return NULL;}
|
|
m_obj->data = NULL;
|
|
m_obj->size = (size_t) map_size;
|
|
m_obj->pos = (size_t) 0;
|
|
m_obj->exports = 0;
|
|
m_obj->offset = offset;
|
|
if (fd == -1) {
|
|
m_obj->fd = -1;
|
|
/* Assume the caller wants to map anonymous memory.
|
|
This is the same behaviour as Windows. mmap.mmap(-1, size)
|
|
on both Windows and Unix map anonymous memory.
|
|
*/
|
|
#ifdef MAP_ANONYMOUS
|
|
/* BSD way to map anonymous memory */
|
|
flags |= MAP_ANONYMOUS;
|
|
#else
|
|
/* SVR4 method to map anonymous memory is to open /dev/zero */
|
|
fd = devzero = open("/dev/zero", O_RDWR);
|
|
if (devzero == -1) {
|
|
Py_DECREF(m_obj);
|
|
PyErr_SetFromErrno(mmap_module_error);
|
|
return NULL;
|
|
}
|
|
#endif
|
|
} else {
|
|
m_obj->fd = dup(fd);
|
|
if (m_obj->fd == -1) {
|
|
Py_DECREF(m_obj);
|
|
PyErr_SetFromErrno(mmap_module_error);
|
|
return NULL;
|
|
}
|
|
}
|
|
|
|
m_obj->data = mmap(NULL, map_size,
|
|
prot, flags,
|
|
fd, offset);
|
|
|
|
if (devzero != -1) {
|
|
close(devzero);
|
|
}
|
|
|
|
if (m_obj->data == (char *)-1) {
|
|
m_obj->data = NULL;
|
|
Py_DECREF(m_obj);
|
|
PyErr_SetFromErrno(mmap_module_error);
|
|
return NULL;
|
|
}
|
|
m_obj->access = (access_mode)access;
|
|
return (PyObject *)m_obj;
|
|
}
|
|
#endif /* UNIX */
|
|
|
|
#ifdef MS_WINDOWS
|
|
static PyObject *
|
|
new_mmap_object(PyObject *self, PyObject *args, PyObject *kwdict)
|
|
{
|
|
mmap_object *m_obj;
|
|
PyObject *map_size_obj = NULL, *offset_obj = NULL;
|
|
Py_ssize_t map_size, offset;
|
|
DWORD off_hi; /* upper 32 bits of offset */
|
|
DWORD off_lo; /* lower 32 bits of offset */
|
|
DWORD size_hi; /* upper 32 bits of size */
|
|
DWORD size_lo; /* lower 32 bits of size */
|
|
char *tagname = "";
|
|
DWORD dwErr = 0;
|
|
int fileno;
|
|
HANDLE fh = 0;
|
|
int access = (access_mode)ACCESS_DEFAULT;
|
|
DWORD flProtect, dwDesiredAccess;
|
|
static char *keywords[] = { "fileno", "length",
|
|
"tagname",
|
|
"access", "offset", NULL };
|
|
|
|
if (!PyArg_ParseTupleAndKeywords(args, kwdict, "iO|ziO", keywords,
|
|
&fileno, &map_size_obj,
|
|
&tagname, &access, &offset_obj)) {
|
|
return NULL;
|
|
}
|
|
|
|
switch((access_mode)access) {
|
|
case ACCESS_READ:
|
|
flProtect = PAGE_READONLY;
|
|
dwDesiredAccess = FILE_MAP_READ;
|
|
break;
|
|
case ACCESS_DEFAULT: case ACCESS_WRITE:
|
|
flProtect = PAGE_READWRITE;
|
|
dwDesiredAccess = FILE_MAP_WRITE;
|
|
break;
|
|
case ACCESS_COPY:
|
|
flProtect = PAGE_WRITECOPY;
|
|
dwDesiredAccess = FILE_MAP_COPY;
|
|
break;
|
|
default:
|
|
return PyErr_Format(PyExc_ValueError,
|
|
"mmap invalid access parameter.");
|
|
}
|
|
|
|
map_size = _GetMapSize(map_size_obj, "size");
|
|
if (map_size < 0)
|
|
return NULL;
|
|
offset = _GetMapSize(offset_obj, "offset");
|
|
if (offset < 0)
|
|
return NULL;
|
|
|
|
/* assume -1 and 0 both mean invalid filedescriptor
|
|
to 'anonymously' map memory.
|
|
XXX: fileno == 0 is a valid fd, but was accepted prior to 2.5.
|
|
XXX: Should this code be added?
|
|
if (fileno == 0)
|
|
PyErr_WarnEx(PyExc_DeprecationWarning,
|
|
"don't use 0 for anonymous memory",
|
|
1);
|
|
*/
|
|
if (fileno != -1 && fileno != 0) {
|
|
fh = (HANDLE)_get_osfhandle(fileno);
|
|
if (fh==(HANDLE)-1) {
|
|
PyErr_SetFromErrno(mmap_module_error);
|
|
return NULL;
|
|
}
|
|
/* Win9x appears to need us seeked to zero */
|
|
lseek(fileno, 0, SEEK_SET);
|
|
}
|
|
|
|
m_obj = PyObject_New(mmap_object, &mmap_object_type);
|
|
if (m_obj == NULL)
|
|
return NULL;
|
|
/* Set every field to an invalid marker, so we can safely
|
|
destruct the object in the face of failure */
|
|
m_obj->data = NULL;
|
|
m_obj->file_handle = INVALID_HANDLE_VALUE;
|
|
m_obj->map_handle = INVALID_HANDLE_VALUE;
|
|
m_obj->tagname = NULL;
|
|
m_obj->offset = offset;
|
|
|
|
if (fh) {
|
|
/* It is necessary to duplicate the handle, so the
|
|
Python code can close it on us */
|
|
if (!DuplicateHandle(
|
|
GetCurrentProcess(), /* source process handle */
|
|
fh, /* handle to be duplicated */
|
|
GetCurrentProcess(), /* target proc handle */
|
|
(LPHANDLE)&m_obj->file_handle, /* result */
|
|
0, /* access - ignored due to options value */
|
|
FALSE, /* inherited by child processes? */
|
|
DUPLICATE_SAME_ACCESS)) { /* options */
|
|
dwErr = GetLastError();
|
|
Py_DECREF(m_obj);
|
|
PyErr_SetFromWindowsErr(dwErr);
|
|
return NULL;
|
|
}
|
|
if (!map_size) {
|
|
DWORD low,high;
|
|
low = GetFileSize(fh, &high);
|
|
/* low might just happen to have the value INVALID_FILE_SIZE;
|
|
so we need to check the last error also. */
|
|
if (low == INVALID_FILE_SIZE &&
|
|
(dwErr = GetLastError()) != NO_ERROR) {
|
|
Py_DECREF(m_obj);
|
|
return PyErr_SetFromWindowsErr(dwErr);
|
|
}
|
|
|
|
#if SIZEOF_SIZE_T > 4
|
|
m_obj->size = (((size_t)high)<<32) + low;
|
|
#else
|
|
if (high)
|
|
/* File is too large to map completely */
|
|
m_obj->size = (size_t)-1;
|
|
else
|
|
m_obj->size = low;
|
|
#endif
|
|
} else {
|
|
m_obj->size = map_size;
|
|
}
|
|
}
|
|
else {
|
|
m_obj->size = map_size;
|
|
}
|
|
|
|
/* set the initial position */
|
|
m_obj->pos = (size_t) 0;
|
|
|
|
m_obj->exports = 0;
|
|
/* set the tag name */
|
|
if (tagname != NULL && *tagname != '\0') {
|
|
m_obj->tagname = PyMem_Malloc(strlen(tagname)+1);
|
|
if (m_obj->tagname == NULL) {
|
|
PyErr_NoMemory();
|
|
Py_DECREF(m_obj);
|
|
return NULL;
|
|
}
|
|
strcpy(m_obj->tagname, tagname);
|
|
}
|
|
else
|
|
m_obj->tagname = NULL;
|
|
|
|
m_obj->access = (access_mode)access;
|
|
/* DWORD is a 4-byte int. If we're on a box where size_t consumes
|
|
* more than 4 bytes, we need to break it apart. Else (size_t
|
|
* consumes 4 bytes), C doesn't define what happens if we shift
|
|
* right by 32, so we need different code.
|
|
*/
|
|
#if SIZEOF_SIZE_T > 4
|
|
size_hi = (DWORD)((offset + m_obj->size) >> 32);
|
|
size_lo = (DWORD)((offset + m_obj->size) & 0xFFFFFFFF);
|
|
off_hi = (DWORD)(offset >> 32);
|
|
off_lo = (DWORD)(offset & 0xFFFFFFFF);
|
|
#else
|
|
size_hi = 0;
|
|
size_lo = (DWORD)(offset + m_obj->size);
|
|
off_hi = 0;
|
|
off_lo = (DWORD)offset;
|
|
#endif
|
|
/* For files, it would be sufficient to pass 0 as size.
|
|
For anonymous maps, we have to pass the size explicitly. */
|
|
m_obj->map_handle = CreateFileMapping(m_obj->file_handle,
|
|
NULL,
|
|
flProtect,
|
|
size_hi,
|
|
size_lo,
|
|
m_obj->tagname);
|
|
if (m_obj->map_handle != NULL) {
|
|
m_obj->data = (char *) MapViewOfFile(m_obj->map_handle,
|
|
dwDesiredAccess,
|
|
off_hi,
|
|
off_lo,
|
|
0);
|
|
if (m_obj->data != NULL)
|
|
return (PyObject *)m_obj;
|
|
else
|
|
dwErr = GetLastError();
|
|
} else
|
|
dwErr = GetLastError();
|
|
Py_DECREF(m_obj);
|
|
PyErr_SetFromWindowsErr(dwErr);
|
|
return NULL;
|
|
}
|
|
#endif /* MS_WINDOWS */
|
|
|
|
/* List of functions exported by this module */
|
|
static struct PyMethodDef mmap_functions[] = {
|
|
{"mmap", (PyCFunction) new_mmap_object,
|
|
METH_VARARGS|METH_KEYWORDS},
|
|
{NULL, NULL} /* Sentinel */
|
|
};
|
|
|
|
static void
|
|
setint(PyObject *d, const char *name, long value)
|
|
{
|
|
PyObject *o = PyInt_FromLong(value);
|
|
if (o && PyDict_SetItemString(d, name, o) == 0) {
|
|
Py_DECREF(o);
|
|
}
|
|
}
|
|
|
|
PyMODINIT_FUNC
|
|
initmmap(void)
|
|
{
|
|
PyObject *dict, *module;
|
|
|
|
/* Patch the object type */
|
|
Py_Type(&mmap_object_type) = &PyType_Type;
|
|
|
|
module = Py_InitModule("mmap", mmap_functions);
|
|
if (module == NULL)
|
|
return;
|
|
dict = PyModule_GetDict(module);
|
|
if (!dict)
|
|
return;
|
|
mmap_module_error = PyExc_EnvironmentError;
|
|
PyDict_SetItemString(dict, "error", mmap_module_error);
|
|
#ifdef PROT_EXEC
|
|
setint(dict, "PROT_EXEC", PROT_EXEC);
|
|
#endif
|
|
#ifdef PROT_READ
|
|
setint(dict, "PROT_READ", PROT_READ);
|
|
#endif
|
|
#ifdef PROT_WRITE
|
|
setint(dict, "PROT_WRITE", PROT_WRITE);
|
|
#endif
|
|
|
|
#ifdef MAP_SHARED
|
|
setint(dict, "MAP_SHARED", MAP_SHARED);
|
|
#endif
|
|
#ifdef MAP_PRIVATE
|
|
setint(dict, "MAP_PRIVATE", MAP_PRIVATE);
|
|
#endif
|
|
#ifdef MAP_DENYWRITE
|
|
setint(dict, "MAP_DENYWRITE", MAP_DENYWRITE);
|
|
#endif
|
|
#ifdef MAP_EXECUTABLE
|
|
setint(dict, "MAP_EXECUTABLE", MAP_EXECUTABLE);
|
|
#endif
|
|
#ifdef MAP_ANONYMOUS
|
|
setint(dict, "MAP_ANON", MAP_ANONYMOUS);
|
|
setint(dict, "MAP_ANONYMOUS", MAP_ANONYMOUS);
|
|
#endif
|
|
|
|
setint(dict, "PAGESIZE", (long)my_getpagesize());
|
|
|
|
setint(dict, "ALLOCATIONGRANULARITY", (long)my_getallocationgranularity());
|
|
|
|
setint(dict, "ACCESS_READ", ACCESS_READ);
|
|
setint(dict, "ACCESS_WRITE", ACCESS_WRITE);
|
|
setint(dict, "ACCESS_COPY", ACCESS_COPY);
|
|
}
|