[Python-checkins] bpo-32798: Add restriction on the offset parameter for mmap.flush in the docs (GH-5621)

Miss Islington (bot) webhook-mailer at python.org
Fri Oct 19 20:47:19 EDT 2018


https://github.com/python/cpython/commit/75ee130c39e73730535d94923fd8322ef616cb83
commit: 75ee130c39e73730535d94923fd8322ef616cb83
branch: 3.6
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2018-10-19T17:47:15-07:00
summary:

bpo-32798: Add restriction on the offset parameter for mmap.flush in the docs (GH-5621)


Add restriction on the offset parameter for mmap.flush.

Explain that ALLOCATIONGRANULARITY is the same as PAGESIZE in Unix.
(cherry picked from commit 027664a3d5ebad575aafe5fcc572e3b05f7f24e5)

Co-authored-by: Pablo Galindo <Pablogsal at gmail.com>

files:
M Doc/library/mmap.rst

diff --git a/Doc/library/mmap.rst b/Doc/library/mmap.rst
index d965fa36b47a..6c0f9a0d1255 100644
--- a/Doc/library/mmap.rst
+++ b/Doc/library/mmap.rst
@@ -61,7 +61,7 @@ To map anonymous memory, -1 should be passed as the fileno along with the length
 
    *offset* may be specified as a non-negative integer offset. mmap references
    will be relative to the offset from the beginning of the file. *offset*
-   defaults to 0.  *offset* must be a multiple of the ALLOCATIONGRANULARITY.
+   defaults to 0.  *offset* must be a multiple of the :const:`ALLOCATIONGRANULARITY`.
 
 
 .. class:: mmap(fileno, length, flags=MAP_SHARED, prot=PROT_WRITE|PROT_READ, access=ACCESS_DEFAULT[, offset])
@@ -90,8 +90,8 @@ To map anonymous memory, -1 should be passed as the fileno along with the length
 
    *offset* may be specified as a non-negative integer offset. mmap references
    will be relative to the offset from the beginning of the file. *offset*
-   defaults to 0.  *offset* must be a multiple of the PAGESIZE or
-   ALLOCATIONGRANULARITY.
+   defaults to 0. *offset* must be a multiple of :const:`ALLOCATIONGRANULARITY`
+   which is equal to :const:`PAGESIZE` on Unix systems.
 
    To ensure validity of the created memory mapping the file specified
    by the descriptor *fileno* is internally automatically synchronized
@@ -185,7 +185,8 @@ To map anonymous memory, -1 should be passed as the fileno along with the length
       use of this call there is no guarantee that changes are written back before
       the object is destroyed.  If *offset* and *size* are specified, only
       changes to the given range of bytes will be flushed to disk; otherwise, the
-      whole extent of the mapping is flushed.
+      whole extent of the mapping is flushed.  *offset* must be a multiple of the
+      :const:`PAGESIZE` or :const:`ALLOCATIONGRANULARITY`.
 
       **(Windows version)** A nonzero value returned indicates success; zero
       indicates failure.



More information about the Python-checkins mailing list