Skip to content

gh-117657: Move static variables in fileutils.c to thread state #120559

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

Closed
Fidget-Spinner wants to merge 4 commits into from
Closed

gh-117657: Move static variables in fileutils.c to thread state #120559

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
990b050
Move static variables in fileutils.c to thread state
Fidget-Spinner Jun 15, 2024
1fe6cfe
revert global var
Fidget-Spinner Jun 15, 2024
6500701
Revert "revert global var"
Fidget-Spinner Jun 15, 2024
19e1624
remove all other references of it
Fidget-Spinner Jun 15, 2024
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
revert global var
  • Loading branch information
@Fidget-Spinner
Fidget-Spinner committed Jun 15, 2024
commit 1fe6cfeb172a785bbbacc91580d846d21858e378
1 change: 0 additions & 1 deletion Include/cpython/pystate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,6 @@ struct _ts {
int fileutils_ioctl_works;
int fileutils_skiproot_initialized;
int fileutils_combineex_initialized;
int fileutils__Py_open_cloexec_works;
};

#ifdef Py_DEBUG
Expand Down
21 changes: 11 additions & 10 deletions Python/fileutils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,16 @@ extern int winerror_to_errno(int);
# include <fcntl.h> // fcntl(F_GETFD)
#endif

#ifdef O_CLOEXEC
/* Does open() support the O_CLOEXEC flag? Possible values:
-1: unknown
0: open() ignores O_CLOEXEC flag, ex: Linux kernel older than 2.6.23
1: open() supports O_CLOEXEC flag, close-on-exec is set
The flag is used by _Py_open(), _Py_open_noraise(), io.FileIO
and os.open(). */
int _Py_open_cloexec_works = -1;
#endif

// The value must be the same in unicodeobject.c.
#define MAX_UNICODE 0x10ffff

Expand Down Expand Up @@ -1614,16 +1624,7 @@ _Py_open_impl(const char *pathname, int flags, int gil_held)
#ifdef MS_WINDOWS
flags |= O_NOINHERIT;
#elif defined(O_CLOEXEC)
PyThreadState *tstate = PyThreadState_Get();
/* Does open() support the O_CLOEXEC flag? Possible values:

-1: unknown
0: open() ignores O_CLOEXEC flag, ex: Linux kernel older than 2.6.23
1: open() supports O_CLOEXEC flag, close-on-exec is set

The flag is used by _Py_open(), _Py_open_noraise(), io.FileIO
and os.open(). */
atomic_flag_works = &tstate->fileutils__Py_open_cloexec_works;
atomic_flag_works = &_Py_open_cloexec_works;
flags |= O_CLOEXEC;
#else
atomic_flag_works = NULL;
Expand Down
4 changes: 4 additions & 0 deletions Tools/c-analyzer/TODO
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@ Objects/bytesobject.c:_Py_onel_strings Py_ssize_t _Py_
Objects/dictobject.c:empty_keys_struct static PyDictKeysObject empty_keys_struct


# "initialized"
Python/fileutils.c:_Py_open_cloexec_works int _Py_open_cloexec_works


# other non-object (40)
Modules/_tracemalloc.c:allocators static struct { PyMemAllocatorEx mem; PyMemAllocatorEx raw; PyMemAllocatorEx obj; } allocators
Modules/_tracemalloc.c:tables_lock static PyThread_type_lock tables_lock
Expand Down