Skip to content

gh-102567: Add -X importtime=2 for logging an importtime message for already-loaded modules #133443

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
AA-Turner wants to merge 6 commits into from
Closed

gh-102567: Add -X importtime=2 for logging an importtime message for already-loaded modules #133443

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dcd6010
Add -X importtime=2 for logging an importtime message for already-loa…
noahbkim May 6, 2024
673008c
Print importtime header before first cached import
AA-Turner May 3, 2025
65eadf0
_pyrepl style changes
AA-Turner May 3, 2025
43c12ec
Simplify config->import_time initialisation
AA-Turner May 3, 2025
414e61d
Update tests, add a few more cases
AA-Turner May 3, 2025
581cd70
Documentation
AA-Turner May 3, 2025
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
Print importtime header before first cached import
  • Loading branch information
@AA-Turner
AA-Turner committed May 5, 2025
commit 673008c418f236a0646e77b79fbafd1206e67561
26 changes: 15 additions & 11 deletions Python/import.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,15 @@ static struct _inittab *inittab_copy = NULL;
#define FIND_AND_LOAD(interp) \
(interp)->imports.find_and_load

#define _IMPORT_TIME_HEADER(interp) \
do { \
if (FIND_AND_LOAD((interp)).header) { \
fputs("import time: self [us] | cumulative | imported package\n", \
stderr); \
FIND_AND_LOAD((interp)).header = 0; \
} \
} while (0)


/*******************/
/* the import lock */
Expand Down Expand Up @@ -262,13 +271,14 @@ import_ensure_initialized(PyInterpreterState *interp, PyObject *mod, PyObject *n
Py_DECREF(value);

done:
/* When -Ximporttime=2, print an import time entry even if an
* imported module has already been loaded.
/* When -X importtime=2, print an import time entry even if an
imported module has already been loaded.
*/
if (_PyInterpreterState_GetConfig(interp)->import_time >= 2) {
if (_PyInterpreterState_GetConfig(interp)->import_time == 2) {
_IMPORT_TIME_HEADER(interp);
#define import_level FIND_AND_LOAD(interp).import_level
fprintf(stderr, "import time: cached | cached | %*s\n",
import_level*2, PyUnicode_AsUTF8(name));
import_level*2, PyUnicode_AsUTF8(name));
#undef import_level
}

Expand Down Expand Up @@ -3702,13 +3712,7 @@ import_find_and_load(PyThreadState *tstate, PyObject *abs_name)
* _PyDict_GetItemIdWithError().
*/
if (import_time) {
#define header FIND_AND_LOAD(interp).header
if (header) {
fputs("import time: self [us] | cumulative | imported package\n",
stderr);
header = 0;
}
#undef header
_IMPORT_TIME_HEADER(interp);

import_level++;
// ignore error: don't block import if reading the clock fails
Expand Down