Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

bpo-1635741: Port mmap module to multiphase initialization #19459

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 5, 2020
Merged

bpo-1635741: Port mmap module to multiphase initialization #19459

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
18e988a
Port mmap module to multiphase initialization
corona10 Apr 10, 2020
d3b55d7
bpo-1635741: Apply code review
corona10 Jun 5, 2020
cf8f667
bpo-1635741: update
corona10 Jun 5, 2020
2d5af30
bpo-1635741: Apply code review
corona10 Jun 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
bpo-1635741: Apply code review
  • Loading branch information
@corona10
corona10 committed Jun 5, 2020
commit d3b55d7d6427cdfed28e535d800f89f5a01cd265
111 changes: 57 additions & 54 deletions 111 Modules/mmapmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1509,139 +1509,142 @@ new_mmap_object(PyTypeObject *type, PyObject *args, PyObject *kwdict)
}
#endif /* MS_WINDOWS */

static void
setint(PyObject *d, const char *name, long value)
{
PyObject *o = PyLong_FromLong(value);
if (o) {
PyDict_SetItemString(d, name, o);
Py_DECREF(o);
}
}

static int
mmap_exec(PyObject *module)
{
if (PyType_Ready(&mmap_object_type) < 0) {
return -1;
}

PyObject *dict = PyModule_GetDict(module);
if (!dict) {
if (PyModule_AddObject(module, "error", PyExc_OSError) < 0) {
corona10 marked this conversation as resolved.
Show resolved Hide resolved
return -1;
}
PyDict_SetItemString(dict, "error", PyExc_OSError);
PyDict_SetItemString(dict, "mmap", (PyObject*) &mmap_object_type);
if (PyModule_AddType(module, &mmap_object_type) < 0) {
return -1;
}

#define ADD_INT_MACRO(module, macro) \
corona10 marked this conversation as resolved.
Show resolved Hide resolved
do { \
if (PyModule_AddIntConstant(module, #macro, macro) < 0) { \
return -1; \
} \
} while (0)

#ifdef PROT_EXEC
setint(dict, "PROT_EXEC", PROT_EXEC);
ADD_INT_MACRO(module, PROT_EXEC);
#endif
#ifdef PROT_READ
setint(dict, "PROT_READ", PROT_READ);
ADD_INT_MACRO(module, PROT_READ);
#endif
#ifdef PROT_WRITE
setint(dict, "PROT_WRITE", PROT_WRITE);
ADD_INT_MACRO(module, PROT_WRITE);
#endif

#ifdef MAP_SHARED
setint(dict, "MAP_SHARED", MAP_SHARED);
ADD_INT_MACRO(module, MAP_SHARED);
#endif
#ifdef MAP_PRIVATE
setint(dict, "MAP_PRIVATE", MAP_PRIVATE);
ADD_INT_MACRO(module, MAP_PRIVATE);
#endif
#ifdef MAP_DENYWRITE
setint(dict, "MAP_DENYWRITE", MAP_DENYWRITE);
ADD_INT_MACRO(module, MAP_DENYWRITE);
#endif
#ifdef MAP_EXECUTABLE
setint(dict, "MAP_EXECUTABLE", MAP_EXECUTABLE);
ADD_INT_MACRO(module, MAP_EXECUTABLE);
#endif
#ifdef MAP_ANONYMOUS
setint(dict, "MAP_ANON", MAP_ANONYMOUS);
setint(dict, "MAP_ANONYMOUS", MAP_ANONYMOUS);
if (PyModule_AddIntConstant(module, "MAP_ANON", MAP_ANONYMOUS) < 0 ) {
return -1;
}
ADD_INT_MACRO(module, MAP_ANONYMOUS);
#endif
#ifdef MAP_POPULATE
setint(dict, "MAP_POPULATE", MAP_POPULATE);
ADD_INT_MACRO(module, MAP_POPULATE);
#endif
if (PyModule_AddIntConstant(module, "PAGESIZE", (long)my_getpagesize()) < 0 ) {
return -1;
}

setint(dict, "PAGESIZE", (long)my_getpagesize());

setint(dict, "ALLOCATIONGRANULARITY", (long)my_getallocationgranularity());
if (PyModule_AddIntConstant(module, "ALLOCATIONGRANULARITY", (long)my_getallocationgranularity()) < 0 ) {
return -1;
}

setint(dict, "ACCESS_DEFAULT", ACCESS_DEFAULT);
setint(dict, "ACCESS_READ", ACCESS_READ);
setint(dict, "ACCESS_WRITE", ACCESS_WRITE);
setint(dict, "ACCESS_COPY", ACCESS_COPY);
ADD_INT_MACRO(module, ACCESS_DEFAULT);
ADD_INT_MACRO(module, ACCESS_READ);
ADD_INT_MACRO(module, ACCESS_WRITE);
ADD_INT_MACRO(module, ACCESS_COPY);

#ifdef HAVE_MADVISE
// Conventional advice values
#ifdef MADV_NORMAL
setint(dict, "MADV_NORMAL", MADV_NORMAL);
ADD_INT_MACRO(module, MADV_NORMAL);
#endif
#ifdef MADV_RANDOM
setint(dict, "MADV_RANDOM", MADV_RANDOM);
ADD_INT_MACRO(module, MADV_RANDOM);
#endif
#ifdef MADV_SEQUENTIAL
setint(dict, "MADV_SEQUENTIAL", MADV_SEQUENTIAL);
ADD_INT_MACRO(module, MADV_SEQUENTIAL);
#endif
#ifdef MADV_WILLNEED
setint(dict, "MADV_WILLNEED", MADV_WILLNEED);
ADD_INT_MACRO(module, MADV_WILLNEED);
#endif
#ifdef MADV_DONTNEED
setint(dict, "MADV_DONTNEED", MADV_DONTNEED);
ADD_INT_MACRO(module, MADV_DONTNEED);
#endif

// Linux-specific advice values
#ifdef MADV_REMOVE
setint(dict, "MADV_REMOVE", MADV_REMOVE);
ADD_INT_MACRO(module, MADV_REMOVE);
#endif
#ifdef MADV_DONTFORK
setint(dict, "MADV_DONTFORK", MADV_DONTFORK);
ADD_INT_MACRO(module, MADV_DONTFORK);
#endif
#ifdef MADV_DOFORK
setint(dict, "MADV_DOFORK", MADV_DOFORK);
ADD_INT_MACRO(module, MADV_DOFORK);
#endif
#ifdef MADV_HWPOISON
setint(dict, "MADV_HWPOISON", MADV_HWPOISON);
ADD_INT_MACRO(module, MADV_HWPOISON);
#endif
#ifdef MADV_MERGEABLE
setint(dict, "MADV_MERGEABLE", MADV_MERGEABLE);
ADD_INT_MACRO(module, MADV_MERGEABLE);
#endif
#ifdef MADV_UNMERGEABLE
setint(dict, "MADV_UNMERGEABLE", MADV_UNMERGEABLE);
ADD_INT_MACRO(module, MADV_UNMERGEABLE);
#endif
#ifdef MADV_SOFT_OFFLINE
setint(dict, "MADV_SOFT_OFFLINE", MADV_SOFT_OFFLINE);
ADD_INT_MACRO(module, MADV_SOFT_OFFLINE);
#endif
#ifdef MADV_HUGEPAGE
setint(dict, "MADV_HUGEPAGE", MADV_HUGEPAGE);
ADD_INT_MACRO(module, MADV_HUGEPAGE);
#endif
#ifdef MADV_NOHUGEPAGE
setint(dict, "MADV_NOHUGEPAGE", MADV_NOHUGEPAGE);
ADD_INT_MACRO(module, MADV_NOHUGEPAGE);
#endif
#ifdef MADV_DONTDUMP
setint(dict, "MADV_DONTDUMP", MADV_DONTDUMP);
ADD_INT_MACRO(module, MADV_DONTDUMP);
#endif
#ifdef MADV_DODUMP
setint(dict, "MADV_DODUMP", MADV_DODUMP);
ADD_INT_MACRO(module, MADV_DODUMP);
#endif
#ifdef MADV_FREE // (Also present on FreeBSD and macOS.)
setint(dict, "MADV_FREE", MADV_FREE);
ADD_INT_MACRO(module, MADV_FREE);
#endif

// FreeBSD-specific
#ifdef MADV_NOSYNC
setint(dict, "MADV_NOSYNC", MADV_NOSYNC);
ADD_INT_MACRO(module, MADV_NOSYNC);
#endif
#ifdef MADV_AUTOSYNC
setint(dict, "MADV_AUTOSYNC", MADV_AUTOSYNC);
ADD_INT_MACRO(module, MADV_AUTOSYNC);
#endif
#ifdef MADV_NOCORE
setint(dict, "MADV_NOCORE", MADV_NOCORE);
ADD_INT_MACRO(module, MADV_NOCORE);
#endif
#ifdef MADV_CORE
setint(dict, "MADV_CORE", MADV_CORE);
ADD_INT_MACRO(module, MADV_CORE);
#endif
#ifdef MADV_PROTECT
setint(dict, "MADV_PROTECT", MADV_PROTECT);
ADD_INT_MACRO(module, MADV_PROTECT);
#endif
#endif // HAVE_MADVISE
corona10 marked this conversation as resolved.
Show resolved Hide resolved
return 0;
Expand All @@ -1663,4 +1666,4 @@ PyMODINIT_FUNC
PyInit_mmap(void)
{
return PyModuleDef_Init(&mmapmodule);
}
}
Morty Proxy This is a proxified and sanitized view of the page, visit original site.