From 07c1bd7457b0a9d65b5cb565dd7cc5dfc5f661db Mon Sep 17 00:00:00 2001 From: "R. David Murray" Date: Sat, 11 Dec 2010 02:05:32 +0000 Subject: [PATCH] Merged revisions 85678 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit ........ r85678 | r.david.murray | 2010-10-17 21:14:06 -0400 (Sun, 17 Oct 2010) | 5 lines #678250: Make mmap flush a noop on ACCESS_READ and ACCESS_COPY. Patch by Sébastien Sablé. This solves a test_mmap failure on AIX. ........ --- Misc/NEWS | 5 +++++ Modules/mmapmodule.c | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Misc/NEWS b/Misc/NEWS index 7eac6445c1..aa9020edd6 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -29,6 +29,11 @@ Library - Issue #10464: netrc now correctly handles lines with embedded '#' characters. +Extensions +---------- + +- Issue #678250: Make mmap flush a noop on ACCESS_READ and ACCESS_COPY. + Tests ----- diff --git a/Modules/mmapmodule.c b/Modules/mmapmodule.c index 00051135d0..79a8a68dde 100644 --- a/Modules/mmapmodule.c +++ b/Modules/mmapmodule.c @@ -125,7 +125,8 @@ mmap_object_dealloc(mmap_object *m_obj) if (m_obj->fd >= 0) (void) close(m_obj->fd); if (m_obj->data!=NULL) { - msync(m_obj->data, m_obj->size, MS_SYNC); + if (m_obj->access != ACCESS_READ && m_obj->access != ACCESS_COPY) + msync(m_obj->data, m_obj->size, MS_SYNC); munmap(m_obj->data, m_obj->size); } #endif /* UNIX */ @@ -570,6 +571,10 @@ mmap_flush_method(mmap_object *self, PyObject *args) PyErr_SetString(PyExc_ValueError, "flush values out of range"); return NULL; } + + if (self->access == ACCESS_READ || self->access == ACCESS_COPY) + return PyLong_FromLong(0); + #ifdef MS_WINDOWS return PyLong_FromLong((long) FlushViewOfFile(self->data+offset, size)); #elif defined(UNIX) -- 2.40.0