Repository navigation
gh-153400: Add a syscall fallback for os.statx #159043
+173
−77
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| On Linux, :func:`os.statx` falls back to the raw syscall when the libc Python is built against does not provide the | ||
| wrapper function. This makes it possible for this function to be available on interpreters built against a libc older than glibc 2.28. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -90,6 +90,9 @@ | |
| #ifdef HAVE_SYS_STAT_H | ||
| # include <sys/stat.h> | ||
| #endif | ||
| #if defined(__linux__) && !defined(HAVE_STRUCT_STATX) && defined(HAVE_LINUX_STAT_H) | ||
| # include <linux/stat.h> // struct statx on older libc versions | ||
| #endif | ||
|
|
||
| #ifdef HAVE_SYS_WAIT_H | ||
| # include <sys/wait.h> // WNOHANG | ||
|
|
@@ -420,9 +423,31 @@ extern char *ctermid_r(char *); | |
| # define STRUCT_STAT struct stat | ||
| #endif | ||
|
|
||
| #if defined(__linux__) && defined(__NR_statx) && \ | ||
| (defined(HAVE_STRUCT_STATX) || \ | ||
| (defined(HAVE_LINUX_STAT_H) && defined(STATX_BASIC_STATS))) | ||
| # define _Py_HAVE_STATX | ||
| #endif | ||
|
|
||
| #if defined(_Py_HAVE_STATX) && defined(HAVE_STATX) | ||
| /* until we can assume glibc 2.28 at runtime, we must weakly link */ | ||
| # pragma weak statx | ||
| #endif | ||
|
|
||
| #ifdef _Py_HAVE_STATX | ||
| /* These Linux UAPI flags may be missing from older libc headers. Including | ||
| linux/fcntl.h alongside fcntl.h would redefine libc structures. */ | ||
| # ifndef AT_NO_AUTOMOUNT | ||
| # define AT_NO_AUTOMOUNT 0x800 | ||
| # endif | ||
| # ifndef AT_EMPTY_PATH | ||
| # define AT_EMPTY_PATH 0x1000 | ||
| # endif | ||
| # ifndef AT_STATX_SYNC_AS_STAT | ||
| # define AT_STATX_SYNC_AS_STAT 0x0000 | ||
| # define AT_STATX_FORCE_SYNC 0x2000 | ||
| # define AT_STATX_DONT_SYNC 0x4000 | ||
| # endif | ||
| static const unsigned int _Py_STATX_KNOWN = (STATX_BASIC_STATS | STATX_BTIME | ||
| #ifdef STATX_MNT_ID | ||
| | STATX_MNT_ID | ||
|
|
@@ -443,7 +468,7 @@ static const unsigned int _Py_STATX_KNOWN = (STATX_BASIC_STATS | STATX_BTIME | |
| | STATX_DIO_READ_ALIGN | ||
| #endif | ||
| ); | ||
| #endif /* _Py_HAVE_STATX */ | ||
|
|
||
|
|
||
| #if !defined(EX_OK) && defined(EXIT_SUCCESS) | ||
|
|
@@ -1235,7 +1260,7 @@ typedef struct { | |
| #endif | ||
| newfunc statresult_new_orig; | ||
| PyObject *StatResultType; | ||
| #ifdef _Py_HAVE_STATX | ||
| PyObject *StatxResultType; | ||
| #endif | ||
| PyObject *StatVFSResultType; | ||
|
|
@@ -2620,7 +2645,7 @@ _posix_clear(PyObject *module) | |
| Py_CLEAR(state->SchedParamType); | ||
| #endif | ||
| Py_CLEAR(state->StatResultType); | ||
| #ifdef _Py_HAVE_STATX | ||
| Py_CLEAR(state->StatxResultType); | ||
| #endif | ||
| Py_CLEAR(state->StatVFSResultType); | ||
|
|
@@ -2648,7 +2673,7 @@ _posix_traverse(PyObject *module, visitproc visit, void *arg) | |
| Py_VISIT(state->SchedParamType); | ||
| #endif | ||
| Py_VISIT(state->StatResultType); | ||
| #ifdef _Py_HAVE_STATX | ||
| Py_VISIT(state->StatxResultType); | ||
| #endif | ||
| Py_VISIT(state->StatVFSResultType); | ||
|
|
@@ -3337,7 +3362,7 @@ os_lstat_impl(PyObject *module, path_t *path, int dir_fd) | |
| } | ||
|
|
||
|
|
||
| #ifdef _Py_HAVE_STATX | ||
| typedef struct { | ||
| PyObject_HEAD | ||
| dev_t rdev, dev; | ||
|
|
@@ -3693,12 +3718,21 @@ os_statx_impl(PyObject *module, path_t *path, unsigned int mask, int flags, | |
| } | ||
|
|
||
| int result; | ||
| int statx_dir_fd = path->is_fd ? path->fd : dir_fd; | ||
| const char *statx_path = path->is_fd ? "" : path->narrow; | ||
| if (path->is_fd) { | ||
| flags |= AT_EMPTY_PATH; | ||
| } | ||
| Py_BEGIN_ALLOW_THREADS | ||
| #ifdef HAVE_STATX | ||
| if (statx != NULL) { | ||
| result = statx(statx_dir_fd, statx_path, flags, mask, &v->stx); | ||
| } | ||
| else | ||
| #endif | ||
| { | ||
| result = syscall(__NR_statx, statx_dir_fd, statx_path, flags, mask, | ||
| &v->stx); | ||
| } | ||
| Py_END_ALLOW_THREADS | ||
|
|
||
|
|
@@ -3713,7 +3747,7 @@ os_statx_impl(PyObject *module, path_t *path, unsigned int mask, int flags, | |
| assert(!PyErr_Occurred()); | ||
| return (PyObject *)v; | ||
| } | ||
| #endif /* _Py_HAVE_STATX */ | ||
|
|
||
|
|
||
| /*[clinic input] | ||
|
|
@@ -18808,7 +18842,7 @@ all_ins(PyObject *m) | |
| if (PyModule_AddIntMacro(m, AT_NO_AUTOMOUNT)) return -1; | ||
| #endif | ||
|
|
||
| #ifdef _Py_HAVE_STATX | ||
| if (PyModule_AddIntMacro(m, STATX_TYPE)) return -1; | ||
| if (PyModule_AddIntMacro(m, STATX_MODE)) return -1; | ||
| if (PyModule_AddIntMacro(m, STATX_NLINK)) return -1; | ||
|
|
@@ -18845,7 +18879,7 @@ all_ins(PyObject *m) | |
| if (PyModule_AddIntMacro(m, AT_STATX_FORCE_SYNC)) return -1; | ||
| if (PyModule_AddIntMacro(m, AT_STATX_DONT_SYNC)) return -1; | ||
| /* STATX_ATTR_* constants are in the stat module */ | ||
| #endif /* _Py_HAVE_STATX */ | ||
|
|
||
| #if defined(__APPLE__) | ||
| if (PyModule_AddIntConstant(m, "_COPYFILE_DATA", COPYFILE_DATA)) return -1; | ||
|
|
@@ -19126,21 +19160,10 @@ posixmodule_exec(PyObject *m) | |
| } | ||
| #endif | ||
|
|
||
| #ifdef _Py_HAVE_STATX | ||
| state->StatxResultType = PyType_FromModuleAndSpec(m, &pystatx_result_spec, NULL); | ||
| if (PyModule_AddObjectRef(m, "statx_result", state->StatxResultType) < 0) { | ||
| return -1; | ||
| } | ||
| #endif | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -344,6 +344,7 @@ HAVE_LINUX_QRTR_H | |
| HAVE_LINUX_RANDOM_H | ||
| HAVE_LINUX_SCHED_H | ||
| HAVE_LINUX_SOUNDCARD_H | ||
| HAVE_LINUX_STAT_H | ||
| HAVE_LINUX_TIPC_H | ||
| HAVE_LINUX_VM_SOCKETS_H | ||
| HAVE_LINUX_WAIT_H | ||
|
|
@@ -540,6 +541,7 @@ HAVE_STROPTS_H | |
| HAVE_STRSIGNAL | ||
| HAVE_STRUCT_PASSWD_PW_GECOS | ||
| HAVE_STRUCT_PASSWD_PW_PASSWD | ||
| HAVE_STRUCT_STATX | ||
| HAVE_STRUCT_STATX_STX_ATOMIC_WRITE_UNIT_MAX_OPT | ||
| HAVE_STRUCT_STATX_STX_ATOMIC_WRITE_UNIT_MIN | ||
| HAVE_STRUCT_STATX_STX_DIO_MEM_ALIGN | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should this say "and build time kernel" like the others below?