Visitar URL original
gh-119213: Be More Careful About _PyArg_Parser.kwtuple Across Interpreters by ericsnowcurrently · Pull Request #119331 · python/cpython · GitHub
Skip to content

gh-119213: Be More Careful About _PyArg_Parser.kwtuple Across Interpreters #119331

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
ericsnowcurrently merged 9 commits into from
May 22, 2024
Merged

gh-119213: Be More Careful About _PyArg_Parser.kwtuple Across Interpreters #119331

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f0f080b
Identify where the problem is.
ericsnowcurrently May 21, 2024
c288a71
Add a TODO.
ericsnowcurrently May 21, 2024
35abdad
Fix a no-gil bug in _parser_init().
ericsnowcurrently May 21, 2024
e179765
Add a test for the crash.
ericsnowcurrently May 21, 2024
e6f78fb
Always make sure kwtuple is allocatoed against the main interpreter.
ericsnowcurrently May 21, 2024
dbf113b
Add NEWS.
ericsnowcurrently May 21, 2024
9b73c3d
Drop a dead line.
ericsnowcurrently May 21, 2024
6b9c436
Update global objects.
ericsnowcurrently May 21, 2024
9157ad5
Merge branch 'main' into fix-getargs-parser
ericsnowcurrently May 21, 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
Fix a no-gil bug in _parser_init().
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed May 21, 2024
commit 35abdad2e446f87600e415cd82af26edbf7d855f
5 changes: 3 additions & 2 deletions Python/getargs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1971,8 +1971,8 @@ _parser_init(void *arg)
parser->next = _Py_atomic_load_ptr(&_PyRuntime.getargs.static_parsers);
do {
// compare-exchange updates parser->next on failure
} while (_Py_atomic_compare_exchange_ptr(&_PyRuntime.getargs.static_parsers,
&parser->next, parser));
} while (!_Py_atomic_compare_exchange_ptr(&_PyRuntime.getargs.static_parsers,
Comment thread
1st1 marked this conversation as resolved.
&parser->next, parser));
return 0;
}

Expand Down Expand Up @@ -2885,6 +2885,7 @@ _PyArg_Fini(void)
struct _PyArg_Parser *tmp, *s = _PyRuntime.getargs.static_parsers;
while (s) {
tmp = s->next;
//assert(tmp != s);

@1st1 1st1 May 21, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
//assert(tmp != s);

@ericsnowcurrently ericsnowcurrently May 21, 2024

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

s->next = NULL;
parser_clear(s);
s = tmp;
Expand Down