Skip to content

bpo-1635741: port multiprocessing to multiphase init #21378

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
vstinner merged 6 commits into from
Aug 11, 2020
Merged

bpo-1635741: port multiprocessing to multiphase init #21378

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1c0c832
port multiprocessing to multiphase init
koubaa Jul 7, 2020
b31425d
fix issues
Jul 8, 2020
d196df9
update based on review
koubaa Jul 9, 2020
e2a12af
update based on review
koubaa Jul 9, 2020
08aa12b
fix macro
koubaa Jul 9, 2020
064d8e0
fix refcount issue
koubaa Aug 10, 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
update based on review
  • Loading branch information
@koubaa
koubaa committed Jul 9, 2020
commit d196df9941886e611b49a8e8643859ec057e8607
50 changes: 32 additions & 18 deletions Modules/_multiprocessing/multiprocessing.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,16 +139,12 @@ static PyMethodDef module_methods[] = {
* Initialize
*/

static int multiprocessing_exec(PyObject *module)
static int
multiprocessing_exec(PyObject *module)
{
PyObject *value = NULL;

#if defined(MS_WINDOWS) || \
(defined(HAVE_SEM_OPEN) && !defined(POSIX_SEMAPHORES_NOT_ENABLED))
Comment thread
koubaa marked this conversation as resolved.
/* Add _PyMp_SemLock type to module */
if (PyType_Ready(&_PyMp_SemLockType) < 0)
Comment thread
koubaa marked this conversation as resolved.
return -1;
Py_INCREF(&_PyMp_SemLockType);

{
PyObject *py_sem_value_max;
/* Some systems define SEM_VALUE_MAX as an unsigned value that
Expand All @@ -160,25 +156,42 @@ static int multiprocessing_exec(PyObject *module)
py_sem_value_max = PyLong_FromLong(INT_MAX);
else
py_sem_value_max = PyLong_FromLong(SEM_VALUE_MAX);
if (py_sem_value_max == NULL)

if (py_sem_value_max == NULL) {
Py_DECREF(py_sem_value_max);
return -1;
}
PyDict_SetItemString(_PyMp_SemLockType.tp_dict, "SEM_VALUE_MAX",
Comment thread
koubaa marked this conversation as resolved.
Outdated
Comment thread
koubaa marked this conversation as resolved.
Outdated
py_sem_value_max);
}
PyModule_AddObject(module, "SemLock", (PyObject*)&_PyMp_SemLockType);

/* Add _PyMp_SemLock type to module */
Py_INCREF(&_PyMp_SemLockType);
Comment thread
koubaa marked this conversation as resolved.
Outdated
if (PyModule_AddType(module, &_PyMp_SemLockType) < 0) {
Py_DECREF(&_PyMp_SemLockType);
return -1;
}

#endif

/* Add configuration macros */
PyObject *temp = PyDict_New();
if (!temp)
PyObject *flags = PyDict_New();
if (!flags) {
return -1;
Comment thread
koubaa marked this conversation as resolved.
}

#define ADD_FLAG(name) \
value = Py_BuildValue("i", name); \
if (value == NULL) { Py_DECREF(temp); return -1; } \
if (PyDict_SetItemString(temp, #name, value) < 0) { \
Py_DECREF(temp); Py_DECREF(value); return -1; } \
Py_DECREF(value)
#define ADD_FLAG(name) { \
Comment thread
koubaa marked this conversation as resolved.
Outdated
PyObject *value = PyLong_FromLong(name); \
if (value == NULL) { \
Py_DECREF(flags); \
return -1; } \
} \
if (PyDict_SetItemString(flags, #name, value) < 0) { \
Py_DECREF(flags); \
Py_DECREF(value); \
return -1; } \
Py_DECREF(value) \
}

#if defined(HAVE_SEM_OPEN) && !defined(POSIX_SEMAPHORES_NOT_ENABLED)
ADD_FLAG(HAVE_SEM_OPEN);
Expand All @@ -193,8 +206,9 @@ static int multiprocessing_exec(PyObject *module)
ADD_FLAG(HAVE_BROKEN_SEM_UNLINK);
#endif

if (PyModule_AddObject(module, "flags", temp) < 0)
if (PyModule_AddObject(module, "flags", flags) < 0) {
Comment thread
koubaa marked this conversation as resolved.
return -1;
}

return 0;
}
Expand Down