gh-108740: Fix "make regen-all" race condition #108741
Merged
Conversation
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
2 tasks
|
You can test this fix by adding a new global identifier with this patch: index c66a862341..4534768305 100644
--- a/Modules/_asynciomodule.c
+++ b/Modules/_asynciomodule.c
@@ -780,6 +780,7 @@ _asyncio.Future.__init__
*
loop: object = None
+ new_funky_identifier: object = None
This class is *almost* compatible with concurrent.futures.Future.
Run Then revert the local patch, and make run that Moreover, |
|
I removed the misleading messages displayed to the user to ask to run In general, |
|
Maybe:
|
|
We are looking at removing deepfreeze altogether. #108722 |
Good to know! Anyway, it's still worth it to fix Python 3.12 build system (which uses And there is still a dependency issue between |
vstinner
added
needs backport to 3.11
vstinner
force-pushed
the
fix_regen_all_race_cond
branch
from
ab72ab2 to
5bb8646
Compare
|
I updated my PR to better explain the change, and I documented generated files in Doc/using/configure.rst. @erlend-aasland: Would you be available to review my change? |
vstinner
commented
Sep 2, 2023
I'll have a look tomorrow! |
erlend-aasland
approved these changes
Sep 6, 2023
IIUC, it is only partially removed, and the infrastructure remains, so it would make sense to fix the race condition. |
Fix a race condition in "make regen-all". The deepfreeze.c source and files generated by Argument Clinic are now generated or updated before generating "global objects". Previously, some identifiers may miss depending on the order in which these files were generated. * "make regen-global-objects": Make sure that deepfreeze.c is generated and up to date, and always run "make clinic". * "make clinic" no longer runs generate_global_objects.py script anymore. * "make regen-deepfreeze" now only updates deepfreeze.c, it doesn't build deepfreeze.o anymore. * Remove misleading messages in "make regen-global-objects" and "make clinic". They are outdated, these commands are now safe to use. * Document generates files in Doc/using/configure.rst
This reverts commit 4803f4e. We must keep the previous rule because of the Makefile patching (!) that the generate-* scripts does.
vstinner
force-pushed
the
fix_regen_all_race_cond
branch
from
2f5eed3 to
66e8d70
Compare
What what the problem?
I tried again your change :-) |
Good :-) |
|
Thanks @vstinner for the PR 🌮🎉.. I'm working now to backport this PR to: 3.11, 3.12. |
|
Sorry, @vstinner, I could not cleanly backport this to |
|
Sorry, @vstinner, I could not cleanly backport this to |
vstinner
added a commit
to vstinner/cpython
that referenced
this pull request
Sep 6, 2023
Fix a race condition in "make regen-all". The deepfreeze.c source and files generated by Argument Clinic are now generated or updated before generating "global objects". Previously, some identifiers may miss depending on the order in which these files were generated. * "make regen-global-objects": Make sure that deepfreeze.c is generated and up to date, and always run "make clinic". * "make clinic" no longer runs generate_global_objects.py script. * "make regen-deepfreeze" now only updates deepfreeze.c (C file). It doesn't build deepfreeze.o (object) anymore. * Remove misleading messages in "make regen-global-objects" and "make clinic". They are now outdated, these commands are now safe to use. * Document generates files in Doc/using/configure.rst. Co-authored-by: Erlend E. Aasland <[email protected]> (cherry picked from commit db1ee6a)
|
GH-109019 is a backport of this pull request to the 3.12 branch. |
vstinner
added a commit
to vstinner/cpython
that referenced
this pull request
Sep 6, 2023
Fix a race condition in "make regen-all". The deepfreeze.c source and files generated by Argument Clinic are now generated or updated before generating "global objects". Previously, some identifiers may miss depending on the order in which these files were generated. * "make regen-global-objects": Make sure that deepfreeze.c is generated and up to date, and always run "make clinic". * "make clinic" no longer runs generate_global_objects.py script. * "make regen-deepfreeze" now only updates deepfreeze.c (C file). It doesn't build deepfreeze.o (object) anymore. * Remove misleading messages in "make regen-global-objects" and "make clinic". They are now outdated, these commands are now safe to use. Backport notes: * Omit Doc/using/configure.rst changes. Co-authored-by: Erlend E. Aasland <[email protected]> (cherry picked from commit db1ee6a)
vstinner
added a commit
to vstinner/cpython
that referenced
this pull request
Sep 6, 2023
Fix a race condition in "make regen-all". The deepfreeze.c source and files generated by Argument Clinic are now generated or updated before generating "global objects". Previously, some identifiers may miss depending on the order in which these files were generated. * "make regen-global-objects": Make sure that deepfreeze.c is generated and up to date, and always run "make clinic". * "make regen-deepfreeze" now only updates deepfreeze.c (C file). It doesn't build deepfreeze.o (object) anymore. * Remove misleading messages in "make regen-global-objects" and "make clinic". They are now outdated, these commands are now safe to use. Backport notes: * Omit Doc/using/configure.rst changes. * no need to change "make clinic", it didn't run generate_global_objects.py script before. Co-authored-by: Erlend E. Aasland <[email protected]> (cherry picked from commit db1ee6a)
|
GH-109021 is a backport of this pull request to the 3.11 branch. |
|
@erlend-aasland: You may want to review backports, I had conflicts. |
|
Thanks for the review @erlend-aasland, I merged my PR. |
|
vstinner
added a commit
that referenced
this pull request
Sep 6, 2023
) gh-108740: Fix "make regen-all" race condition (#108741) Fix a race condition in "make regen-all". The deepfreeze.c source and files generated by Argument Clinic are now generated or updated before generating "global objects". Previously, some identifiers may miss depending on the order in which these files were generated. * "make regen-global-objects": Make sure that deepfreeze.c is generated and up to date, and always run "make clinic". * "make regen-deepfreeze" now only updates deepfreeze.c (C file). It doesn't build deepfreeze.o (object) anymore. * Remove misleading messages in "make regen-global-objects" and "make clinic". They are now outdated, these commands are now safe to use. Backport notes: * Omit Doc/using/configure.rst changes. * no need to change "make clinic", it didn't run generate_global_objects.py script before. Co-authored-by: Erlend E. Aasland <[email protected]> (cherry picked from commit db1ee6a)
Yhg1s
pushed a commit
that referenced
this pull request
Sep 8, 2023
) gh-108740: Fix "make regen-all" race condition (#108741) Fix a race condition in "make regen-all". The deepfreeze.c source and files generated by Argument Clinic are now generated or updated before generating "global objects". Previously, some identifiers may miss depending on the order in which these files were generated. * "make regen-global-objects": Make sure that deepfreeze.c is generated and up to date, and always run "make clinic". * "make clinic" no longer runs generate_global_objects.py script. * "make regen-deepfreeze" now only updates deepfreeze.c (C file). It doesn't build deepfreeze.o (object) anymore. * Remove misleading messages in "make regen-global-objects" and "make clinic". They are now outdated, these commands are now safe to use. * Document generates files in Doc/using/configure.rst. Co-authored-by: Erlend E. Aasland <[email protected]> (cherry picked from commit db1ee6a)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fix a race condition in "make regen-all". The deepfreeze.c source and files generated by Argument Clinic are now generated or updated before generating "global objects". Previously, some identifiers may miss depending on the order in which these files were generated.