gh-66234: Add flag to disable the use of mmap in dbm.gnu (GH-135005)

This may harm performance, but improve crash tolerance.
This commit is contained in:
Serhiy Storchaka 2025-06-02 21:08:26 +03:00 committed by GitHub
parent 44fb7c361c
commit 0cec424af5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 43 additions and 2 deletions

View file

@ -254,6 +254,9 @@ functionality like crash tolerance.
* ``'s'``: Synchronized mode.
Changes to the database will be written immediately to the file.
* ``'u'``: Do not lock database.
* ``'m'``: Do not use :manpage:`mmap(2)`.
This may harm performance, but improve crash tolerance.
.. versionadded:: next
Not all flags are valid for all versions of GDBM.
See the :data:`open_flags` member for a list of supported flag characters.

View file

@ -96,6 +96,10 @@ dbm
which allow to recover unused free space previously occupied by deleted entries.
(Contributed by Andrea Oliveri in :gh:`134004`.)
* Add the ``'m'`` flag for :func:`dbm.gnu.open` which allows to disable
the use of :manpage:`mmap(2)`.
This may harm performance, but improve crash tolerance.
(Contributed by Serhiy Storchaka in :gh:`66234`.)
difflib
-------

View file

@ -74,12 +74,12 @@ class TestGdbm(unittest.TestCase):
# Test the flag parameter open() by trying all supported flag modes.
all = set(gdbm.open_flags)
# Test standard flags (presumably "crwn").
modes = all - set('fsu')
modes = all - set('fsum')
for mode in sorted(modes): # put "c" mode first
self.g = gdbm.open(filename, mode)
self.g.close()
# Test additional flags (presumably "fsu").
# Test additional flags (presumably "fsum").
flags = all - set('crwn')
for mode in modes:
for flag in flags:
@ -217,6 +217,29 @@ class TestGdbm(unittest.TestCase):
create_empty_file(os.path.join(d, 'test'))
self.assertRaises(gdbm.error, gdbm.open, filename, 'r')
@unittest.skipUnless('m' in gdbm.open_flags, "requires 'm' in open_flags")
def test_nommap_no_crash(self):
self.g = g = gdbm.open(filename, 'nm')
os.truncate(filename, 0)
g.get(b'a', b'c')
g.keys()
g.firstkey()
g.nextkey(b'a')
with self.assertRaises(KeyError):
g[b'a']
with self.assertRaises(gdbm.error):
len(g)
with self.assertRaises(gdbm.error):
g[b'a'] = b'c'
with self.assertRaises(gdbm.error):
del g[b'a']
with self.assertRaises(gdbm.error):
g.setdefault(b'a', b'c')
with self.assertRaises(gdbm.error):
g.reorganize()
if __name__ == '__main__':
unittest.main()

View file

@ -0,0 +1,3 @@
Add the ``'m'`` flag for :func:`dbm.gnu.open` which allows to disable the
use of :manpage:`mmap(2)`. This may harm performance, but improve crash
tolerance.

View file

@ -813,6 +813,11 @@ dbmopen_impl(PyObject *module, PyObject *filename, const char *flags,
case 'u':
iflags |= GDBM_NOLOCK;
break;
#endif
#ifdef GDBM_NOMMAP
case 'm':
iflags |= GDBM_NOMMAP;
break;
#endif
default:
PyErr_Format(state->gdbm_error,
@ -846,6 +851,9 @@ static const char gdbmmodule_open_flags[] = "rwcn"
#endif
#ifdef GDBM_NOLOCK
"u"
#endif
#ifdef GDBM_NOMMAP
"m"
#endif
;