Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

GH-93899: fix checks for eventfd flags (GH-95170)

This commit is contained in:
Kumar Aditya 2022-07-27 18:35:29 +05:30 committed by GitHub
parent 2b37395612
commit 4dd099baff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Misc/NEWS.d/next/Library/2022-07-23-10-50-05.gh-issue-93899.VT34A5.rst Normal file
View File

@ -0,0 +1 @@
Fix check for existence of :data:`os.EFD_CLOEXEC`, :data:`os.EFD_NONBLOCK` and :data:`os.EFD_SEMAPHORE` flags on older kernel versions where these flags are not present. Patch by Kumar Aditya.

14
Modules/clinic/posixmodule.c.h generated
View File

@ -7873,7 +7873,7 @@ exit:
#endif /* defined(HAVE_MEMFD_CREATE) */
#if defined(HAVE_EVENTFD)
#if (defined(HAVE_EVENTFD) && defined(EFD_CLOEXEC))
PyDoc_STRVAR(os_eventfd__doc__,
"eventfd($module, /, initval, flags=EFD_CLOEXEC)\n"
@ -7919,9 +7919,9 @@ exit:
return return_value;
}
#endif /* defined(HAVE_EVENTFD) */
#endif /* (defined(HAVE_EVENTFD) && defined(EFD_CLOEXEC)) */
#if defined(HAVE_EVENTFD)
#if (defined(HAVE_EVENTFD) && defined(EFD_CLOEXEC))
PyDoc_STRVAR(os_eventfd_read__doc__,
"eventfd_read($module, /, fd)\n"
@ -7957,9 +7957,9 @@ exit:
return return_value;
}
#endif /* defined(HAVE_EVENTFD) */
#endif /* (defined(HAVE_EVENTFD) && defined(EFD_CLOEXEC)) */
#if defined(HAVE_EVENTFD)
#if (defined(HAVE_EVENTFD) && defined(EFD_CLOEXEC))
PyDoc_STRVAR(os_eventfd_write__doc__,
"eventfd_write($module, /, fd, value)\n"
@ -7999,7 +7999,7 @@ exit:
return return_value;
}
#endif /* defined(HAVE_EVENTFD) */
#endif /* (defined(HAVE_EVENTFD) && defined(EFD_CLOEXEC)) */
#if (defined(TERMSIZE_USE_CONIO) || defined(TERMSIZE_USE_IOCTL))
@ -9360,4 +9360,4 @@ exit:
#ifndef OS_WAITSTATUS_TO_EXITCODE_METHODDEF
#define OS_WAITSTATUS_TO_EXITCODE_METHODDEF
#endif /* !defined(OS_WAITSTATUS_TO_EXITCODE_METHODDEF) */
/*[clinic end generated code: output=9ff792e207a18392 input=a9049054013a1b77]*/
/*[clinic end generated code: output=c22a8b6de4a0ccb7 input=a9049054013a1b77]*/

10
Modules/posixmodule.c
View File

@ -13107,7 +13107,7 @@ os_memfd_create_impl(PyObject *module, PyObject *name, unsigned int flags)
}
#endif
#ifdef HAVE_EVENTFD
#if defined(HAVE_EVENTFD) && defined(EFD_CLOEXEC)
/*[clinic input]
os.eventfd
@ -13178,7 +13178,7 @@ os_eventfd_write_impl(PyObject *module, int fd, unsigned long long value)
}
Py_RETURN_NONE;
}
#endif /* HAVE_EVENTFD */
#endif /* HAVE_EVENTFD && EFD_CLOEXEC */
/* Terminal size querying */
@ -15465,11 +15465,15 @@ all_ins(PyObject *m)
#endif
#endif /* HAVE_MEMFD_CREATE */
#ifdef HAVE_EVENTFD
#if defined(HAVE_EVENTFD) && defined(EFD_CLOEXEC)
if (PyModule_AddIntMacro(m, EFD_CLOEXEC)) return -1;
#ifdef EFD_NONBLOCK
if (PyModule_AddIntMacro(m, EFD_NONBLOCK)) return -1;
#endif
#ifdef EFD_SEMAPHORE
if (PyModule_AddIntMacro(m, EFD_SEMAPHORE)) return -1;
#endif
#endif /* HAVE_EVENTFD && EFD_CLOEXEC */
#if defined(__APPLE__)
if (PyModule_AddIntConstant(m, "_COPYFILE_DATA", COPYFILE_DATA)) return -1;