Visitar URL original
gh-99726: Improves correctness of stat results for Windows, and uses faster API when available by zooba · Pull Request #102149 · python/cpython · GitHub
Skip to content

gh-99726: Improves correctness of stat results for Windows, and uses faster API when available #102149

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
zooba merged 13 commits into from
Mar 16, 2023
Merged

gh-99726: Improves correctness of stat results for Windows, and uses faster API when available #102149

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
5187810
gh-99726: Improves correctness of stat results for Windows, and uses …
zooba Feb 22, 2023
4f9695e
Few typos
zooba Feb 22, 2023
00460d8
Whitespace
zooba Feb 22, 2023
a01fb67
Add st_birthtime_ns and deprecate st_ctime instead of changing it
zooba Feb 28, 2023
0314273
Merge remote-tracking branch 'cpython/main' into gh-99726-2
zooba Feb 28, 2023
652dd19
Merge remote-tracking branch 'cpython/main' into gh-99726-2
zooba Mar 3, 2023
e2fa2a5
Update API
zooba Mar 3, 2023
23a4dcc
Remove unnecessary FileId check and fix extension check
zooba Mar 6, 2023
64cc626
Merge remote-tracking branch 'cpython/main' into gh-99726-2
zooba Mar 6, 2023
ce037f3
Merge remote-tracking branch 'cpython/main' into gh-99726-2
zooba Mar 9, 2023
a7c6394
Merge branch 'main' into gh-99726-2
zooba Mar 14, 2023
de11468
Store correct birthtime value
zooba Mar 14, 2023
d168950
Improve whatsnew
zooba Mar 14, 2023
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 API
  • Loading branch information
@zooba
zooba committed Mar 3, 2023
commit e2fa2a5b2d016882e5ad477dd780856889f90e66
4 changes: 2 additions & 2 deletions Include/internal/pycore_fileutils_windows.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ typedef struct _FILE_STAT_BASIC_INFORMATION {
ULONG DeviceType;
ULONG DeviceCharacteristics;
ULONG Reserved;
ULONGLONG FileIdHigh;
ULONGLONG VolumeSerialNumber;
FILE_ID_128 FileId128;
LARGE_INTEGER VolumeSerialNumber;
} FILE_STAT_BASIC_INFORMATION;

typedef enum _FILE_INFO_BY_NAME_CLASS {
Expand Down
32 changes: 21 additions & 11 deletions Python/fileutils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1086,6 +1086,16 @@ attributes_to_mode(DWORD attr)
return m;
}


typedef union {
FILE_ID_128 id;
struct {
uint64_t st_ino;
uint64_t st_ino_high;
};
} id_128_to_ino;


void
_Py_attribute_data_to_stat(BY_HANDLE_FILE_INFORMATION *info, ULONG reparse_tag,
FILE_BASIC_INFO *basic_info, FILE_ID_INFO *id_info,
Expand All @@ -1110,14 +1120,8 @@ _Py_attribute_data_to_stat(BY_HANDLE_FILE_INFORMATION *info, ULONG reparse_tag,
result->st_nlink = info->nNumberOfLinks;

if (id_info) {
union {
FILE_ID_128 id_info;
struct {
uint64_t st_ino;
uint64_t st_ino_high;
};
} file_id;
file_id.id_info = id_info->FileId;
id_128_to_ino file_id;
file_id.id = id_info->FileId;
result->st_ino = file_id.st_ino;
result->st_ino_high = file_id.st_ino_high;
} else {
Expand Down Expand Up @@ -1150,9 +1154,15 @@ _Py_stat_basic_info_to_stat(FILE_STAT_BASIC_INFORMATION *info,
LARGE_INTEGER_to_time_t_nsec(&info->LastWriteTime, &result->st_mtime, &result->st_mtime_nsec);
LARGE_INTEGER_to_time_t_nsec(&info->LastAccessTime, &result->st_atime, &result->st_atime_nsec);
result->st_nlink = info->NumberOfLinks;
result->st_dev = info->VolumeSerialNumber;
result->st_ino = info->FileId.QuadPart;
result->st_ino_high = info->FileIdHigh;
result->st_dev = info->VolumeSerialNumber.QuadPart;
id_128_to_ino file_id;
file_id.id = info->FileId128;
result->st_ino = file_id.st_ino;
result->st_ino_high = file_id.st_ino_high;
// TODO: Confirm whether FileId128 may be 0 but FileId is set
if (!result->st_ino && !result->st_ino_high) {
result->st_ino = info->FileId.QuadPart;
}
/* bpo-37834: Only actual symlinks set the S_IFLNK flag. But lstat() will
open other name surrogate reparse points without traversing them. To
detect/handle these, check st_file_attributes and st_reparse_tag. */
Expand Down