Skip to content

bpo-39533: Use statx on more recent Linux to expose st_flags and st_btime on all platforms #19125

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

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

bpo-39533: Use statx on more recent Linux to expose st_flags and st_btime on all platforms #19125

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4d82bc3
Update file flag bits in the stat module and add the relevant Linux ones
ntninja Mar 22, 2020
e6bd28b
Always expose `st_flags` and `st_btime{,_ns}` on all platforms
ntninja Mar 23, 2020
c07edf2
Add option to enable Linux statx in configure
ntninja Mar 23, 2020
54a23b5
Add statx-based stat implementation for Linux
ntninja Mar 23, 2020
53cee11
Map Linux STATX_FLAG_* and Windows FILE_ATTRIBUTE_* flags to their BS…
ntninja Mar 23, 2020
16775d0
bpo-39533: Add documentation on new :func:`os.stat` properties
ntninja Mar 23, 2020
9aae324
Add support for `STATX_ATTR_{VERITY,DAX}` and the new `stx_mnt_id` field
ntninja Sep 12, 2022
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
Always expose st_flags and st_btime{,_ns} on all platforms 
On BSD/macOS this uses the value of `st_birthtime` (which remains for
compatibity reasons), on Windows it duplicates the value of `st_ctime`.

A Linux implementation is added in subsequent commits.
  • Loading branch information
@ntninja
ntninja committed Sep 15, 2022
commit e6bd28b14762bd30ac96becd66aba27a619b552e
60 changes: 33 additions & 27 deletions Modules/posixmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2092,9 +2092,12 @@ static PyStructSequence_Field stat_result_fields[] = {
{"st_atime", "time of last access"},
{"st_mtime", "time of last modification"},
{"st_ctime", "time of last change"},
{"st_btime", "time of creation"},
{"st_atime_ns", "time of last access in nanoseconds"},
{"st_mtime_ns", "time of last modification in nanoseconds"},
{"st_ctime_ns", "time of last change in nanoseconds"},
{"st_btime_ns", "time of creation in nanoseconds"},
{"st_flags", "user defined flags for file"},
#ifdef HAVE_STRUCT_STAT_ST_BLKSIZE
{"st_blksize", "blocksize for filesystem I/O"},
#endif
Expand All @@ -2104,9 +2107,6 @@ static PyStructSequence_Field stat_result_fields[] = {
#ifdef HAVE_STRUCT_STAT_ST_RDEV
{"st_rdev", "device type (if inode device)"},
#endif
#ifdef HAVE_STRUCT_STAT_ST_FLAGS
{"st_flags", "user defined flags for file"},
#endif
#ifdef HAVE_STRUCT_STAT_ST_GEN
{"st_gen", "generation number"},
#endif
Expand All @@ -2126,9 +2126,9 @@ static PyStructSequence_Field stat_result_fields[] = {
};

#ifdef HAVE_STRUCT_STAT_ST_BLKSIZE
#define ST_BLKSIZE_IDX 16
#define ST_BLKSIZE_IDX 19
#else
#define ST_BLKSIZE_IDX 15
#define ST_BLKSIZE_IDX 18
#endif

#ifdef HAVE_STRUCT_STAT_ST_BLOCKS
Expand All @@ -2143,16 +2143,10 @@ static PyStructSequence_Field stat_result_fields[] = {
#define ST_RDEV_IDX ST_BLOCKS_IDX
#endif

#ifdef HAVE_STRUCT_STAT_ST_FLAGS
#define ST_FLAGS_IDX (ST_RDEV_IDX+1)
#else
#define ST_FLAGS_IDX ST_RDEV_IDX
#endif

#ifdef HAVE_STRUCT_STAT_ST_GEN
#define ST_GEN_IDX (ST_FLAGS_IDX+1)
#define ST_GEN_IDX (ST_RDEV_IDX+1)
#else
#define ST_GEN_IDX ST_FLAGS_IDX
#define ST_GEN_IDX ST_RDEV_IDX
#endif

#ifdef HAVE_STRUCT_STAT_ST_BIRTHTIME
Expand Down Expand Up @@ -2322,7 +2316,8 @@ _posix_free(void *module)
}

static void
fill_time(PyObject *module, PyObject *v, int index, time_t sec, unsigned long nsec)
fill_time(PyObject *module, PyObject *v, int index1, int index2, int index3,
time_t sec, unsigned long nsec)
{
PyObject *s = _PyLong_FromTime_t(sec);
PyObject *ns_fractional = PyLong_FromUnsignedLong(nsec);
Expand All @@ -2346,10 +2341,12 @@ fill_time(PyObject *module, PyObject *v, int index, time_t sec, unsigned long ns
goto exit;
}

PyStructSequence_SET_ITEM(v, index, s);
PyStructSequence_SET_ITEM(v, index+3, float_s);
PyStructSequence_SET_ITEM(v, index+6, ns_total);
s = NULL;
if(index1 >= 0) {
PyStructSequence_SET_ITEM(v, index1, s);
s = NULL;
}
PyStructSequence_SET_ITEM(v, index2, float_s);
PyStructSequence_SET_ITEM(v, index3, ns_total);
float_s = NULL;
ns_total = NULL;
exit:
Expand Down Expand Up @@ -2407,9 +2404,19 @@ _pystat_fromstructstat(PyObject *module, STRUCT_STAT *st)
#else
ansec = mnsec = cnsec = 0;
#endif
fill_time(module, v, 7, st->st_atime, ansec);
fill_time(module, v, 8, st->st_mtime, mnsec);
fill_time(module, v, 9, st->st_ctime, cnsec);
fill_time(module, v, 7, 10, 14, st->st_atime, ansec);
fill_time(module, v, 8, 11, 15, st->st_mtime, mnsec);
fill_time(module, v, 9, 12, 16, st->st_ctime, cnsec);

#ifdef MS_WINDOWS
// CTime is BTime on Windows
fill_time(module, v, -1, 13, 17, st->st_ctime, cnsec);
#endif

#ifdef HAVE_STRUCT_STAT_ST_FLAGS
PyStructSequence_SET_ITEM(module, v, 18,
PyLong_FromLong((long)st->st_flags));
#endif

#ifdef HAVE_STRUCT_STAT_ST_BLKSIZE
PyStructSequence_SET_ITEM(v, ST_BLKSIZE_IDX,
Expand Down Expand Up @@ -2438,14 +2445,13 @@ _pystat_fromstructstat(PyObject *module, STRUCT_STAT *st)
bnsec = 0;
#endif
val = PyFloat_FromDouble(bsec + 1e-9*bnsec);
PyStructSequence_SET_ITEM(v, ST_BIRTHTIME_IDX,
val);
PyStructSequence_SET_ITEM(v, ST_BIRTHTIME_IDX, val);

// Also use this value as BTime, but keep the older name for
// compatiblity on these platforms
fill_time(module, v, -1, 13, 17, bsec, bnsec);
}
#endif
#ifdef HAVE_STRUCT_STAT_ST_FLAGS
PyStructSequence_SET_ITEM(v, ST_FLAGS_IDX,
PyLong_FromLong((long)st->st_flags));
#endif
#ifdef HAVE_STRUCT_STAT_ST_FILE_ATTRIBUTES
PyStructSequence_SET_ITEM(v, ST_FILE_ATTRIBUTES_IDX,
PyLong_FromUnsignedLong(st->st_file_attributes));
Expand Down
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy