Skip to content
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

Jump to bottom

gh-117953: Refactor Import Machinery Code for Extension Modules #118116

Closed
wants to merge 40 commits into from
Closed

gh-117953: Refactor Import Machinery Code for Extension Modules #118116

wants to merge 40 commits into from

Commits on Apr 16, 2024

  1. Factor out _PyImport_RunDynamicModule().

    @ericsnowcurrently
    ericsnowcurrently committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    cc67849 View commit details
    Browse the repository at this point in the history

  2. Drop _PyImport_LoadDynamicModuleWithSpec().

    @ericsnowcurrently
    ericsnowcurrently committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    2e5ecde View commit details
    Browse the repository at this point in the history

  3. Add an assert.

    @ericsnowcurrently
    ericsnowcurrently committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    b810cd8 View commit details
    Browse the repository at this point in the history

  4. Factor out fix_up_extension_for_interpreter().

    @ericsnowcurrently
    ericsnowcurrently committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    8d0ef38 View commit details
    Browse the repository at this point in the history

  5. Do _extensions_cache_set() first.

    @ericsnowcurrently
    ericsnowcurrently committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    7f930cc View commit details
    Browse the repository at this point in the history

  6. Calculate path_bytes ahead of time.

    @ericsnowcurrently
    ericsnowcurrently committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    1ffeaef View commit details
    Browse the repository at this point in the history

  7. Move the audit entry to _imp_create_dynamic_impl().

    @ericsnowcurrently
    ericsnowcurrently committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    7500285 View commit details
    Browse the repository at this point in the history

  8. _Py_ext_module_loader_info_from_spec() -> _Py_ext_module_loader_info_… 

    …init_from_spec()
    @ericsnowcurrently
    ericsnowcurrently committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    3c0b170 View commit details
    Browse the repository at this point in the history

  9. Add info.newcontext.

    @ericsnowcurrently
    ericsnowcurrently committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    02e24cc View commit details
    Browse the repository at this point in the history

  10. Split up _PyImport_RunDynamicModule() along cross-interpreter-safe bo… 

    …undaries.
    @ericsnowcurrently
    ericsnowcurrently committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    ba5ffa7 View commit details
    Browse the repository at this point in the history

  11. Drop _PyImport_RunDynamicModule().

    @ericsnowcurrently
    ericsnowcurrently committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    b895966 View commit details
    Browse the repository at this point in the history

  12. Always close the file handle.

    @ericsnowcurrently
    ericsnowcurrently committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    76fa273 View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2024

  1. Revert the fclose() change.

    @ericsnowcurrently
    ericsnowcurrently committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    1e936c5 View commit details
    Browse the repository at this point in the history

  2. Factor out create_dynamic().

    @ericsnowcurrently
    ericsnowcurrently committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    6bb07b9 View commit details
    Browse the repository at this point in the history

  3. Drop _PyImport_FixupExtensionObject().

    @ericsnowcurrently
    ericsnowcurrently committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    2705e65 View commit details
    Browse the repository at this point in the history

  4. Move setting __file__ to fix_up_extension().

    @ericsnowcurrently
    ericsnowcurrently committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    98d8b4b View commit details
    Browse the repository at this point in the history

  5. Pass tstate through to fix_up_extension().

    @ericsnowcurrently
    ericsnowcurrently committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    ddf1135 View commit details
    Browse the repository at this point in the history

  6. Add a note about _PyImport_FixupBuiltin().

    @ericsnowcurrently
    ericsnowcurrently committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    694a763 View commit details
    Browse the repository at this point in the history

  7. Always expect a valid modules dict passed to fix_up_extension().

    @ericsnowcurrently
    ericsnowcurrently committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    72e0d73 View commit details
    Browse the repository at this point in the history

  8. Factor out reload_singlephase_extension().

    @ericsnowcurrently
    ericsnowcurrently committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    3f14a67 View commit details
    Browse the repository at this point in the history

  9. res.singlephase -> res.kind

    @ericsnowcurrently
    ericsnowcurrently committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    b5f5868 View commit details
    Browse the repository at this point in the history

  10. Factor out _extensions_cache_init().

    @ericsnowcurrently
    ericsnowcurrently committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    a5f7535 View commit details
    Browse the repository at this point in the history

  11. Factor out _extensions_cache_find_unlocked().

    @ericsnowcurrently
    ericsnowcurrently committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    e8d674a View commit details
    Browse the repository at this point in the history

  12. Use _PyImport_RunModInitFunc() in create_builtin().

    @ericsnowcurrently
    ericsnowcurrently committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    27b365d View commit details
    Browse the repository at this point in the history

  13. Clean up _PyImport_FixupBuiltin().

    @ericsnowcurrently
    ericsnowcurrently committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    5128702 View commit details
    Browse the repository at this point in the history

  14. Add some asserts to _PyImport_RunModInitFunc().

    @ericsnowcurrently
    ericsnowcurrently committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    aaec360 View commit details
    Browse the repository at this point in the history

  15. Drop the replace arg to _extensions_cache_set().

    @ericsnowcurrently
    ericsnowcurrently committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    f97671e View commit details
    Browse the repository at this point in the history

  16. Check the module returned by import_find_extension() to ensure single… 

    …-phase init.
    @ericsnowcurrently
    ericsnowcurrently committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    2366983 View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2024

  1. Allow mod->md_def to be NULL.

    @ericsnowcurrently
    ericsnowcurrently committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    d5039ea View commit details
    Browse the repository at this point in the history

  2. Call _PyImport_RunModInitFunc() in reload_singlephase_extension().

    @ericsnowcurrently
    ericsnowcurrently committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    67d217b View commit details
    Browse the repository at this point in the history

  3. res->err is an array, not just a pointer.

    @ericsnowcurrently
    ericsnowcurrently committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    9e40287 View commit details
    Browse the repository at this point in the history

  4. Factor out import_run_extension() (and drop create_dynamic()).

    @ericsnowcurrently
    ericsnowcurrently committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    b8c2a1d View commit details
    Browse the repository at this point in the history

  5. Factor out update_extension_cache() and drop fix_up_extension_for_int… 

    …erpreter().
    @ericsnowcurrently
    ericsnowcurrently committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    967c649 View commit details
    Browse the repository at this point in the history

  6. We already know the def is okay.

    @ericsnowcurrently
    ericsnowcurrently committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    aecf56c View commit details
    Browse the repository at this point in the history

  7. Revive fix_up_extension_for_interpreter().

    @ericsnowcurrently
    ericsnowcurrently committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    0d03d23 View commit details
    Browse the repository at this point in the history

  8. Add a distinct _Py_ext_module_loader_info.path (and old path -> filen… 

    …ame).
    @ericsnowcurrently
    ericsnowcurrently committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    cace102 View commit details
    Browse the repository at this point in the history

  9. Do not call update_extensions_cache() in fix_up_extension().

    @ericsnowcurrently
    ericsnowcurrently committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    3cf0db0 View commit details
    Browse the repository at this point in the history

  10. Let the modules arg to fix_up_extension_for_interpreter() be NULL.

    @ericsnowcurrently
    ericsnowcurrently committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    9b3088a View commit details
    Browse the repository at this point in the history

  11. Let the caller of update_extensions_cache() decide if m_copy should b… 

    …e populated.
    @ericsnowcurrently
    ericsnowcurrently committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    4ac1644 View commit details
    Browse the repository at this point in the history

  12. Fix the update_extensions_cache() signature.

    @ericsnowcurrently
    ericsnowcurrently committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    393a177 View commit details
    Browse the repository at this point in the history