Skip to content

bpo-31415: Improve caching of the importtime option. #4138

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
serhiy-storchaka merged 7 commits into from
Nov 7, 2017
Merged

bpo-31415: Improve caching of the importtime option. #4138

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
439048d
bpo-31415: Improve caching of the importtime option.
serhiy-storchaka Oct 26, 2017
c4ae23e
Merge branch 'master' into x-importtime-caching
warsaw Nov 2, 2017
76915da
Merge branch 'master' into x-importtime-caching
warsaw Nov 2, 2017
44196fc
Update import.c
warsaw Nov 2, 2017
fc05eb1
Update import.c
warsaw Nov 3, 2017
e2b1e21
Merge branch 'master' into x-importtime-caching
serhiy-storchaka Nov 3, 2017
1701525
Misc minor changes.
serhiy-storchaka Nov 3, 2017
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
33 changes: 20 additions & 13 deletions Python/import.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1667,45 +1667,52 @@ PyImport_ImportModuleLevelObject(PyObject *name, PyObject *globals,
}
}
else {
static int ximporttime = 0;
/* 1 -- true, 0 -- false, -1 -- not initialized */
static int ximporttime = -1;
static int import_level;
static _PyTime_t accumulated;
_Py_IDENTIFIER(importtime);

_PyTime_t t1 = 0, accumulated_copy = accumulated;

Py_XDECREF(mod);

/* XOptions is initialized after first some imports.
* So we can't have negative cache.
* Anyway, importlib.__find_and_load is much slower than
* _PyDict_GetItemId()
* So we can't have negative cache before completed initialization.
* Anyway, importlib._find_and_load is much slower than
* _PyDict_GetItemIdWithError().
*/
if (ximporttime == 0) {
char *envoption = Py_GETENV("PYTHONPROFILEIMPORTTIME");
if (envoption != NULL && strlen(envoption) > 0) {
if (ximporttime < 0) {
const char *envoption = Py_GETENV("PYTHONPROFILEIMPORTTIME");
if (envoption != NULL && *envoption != '\0') {
ximporttime = 1;
}
else {
PyObject *xoptions = PySys_GetXOptions();
PyObject *value = NULL;
if (xoptions) {
PyObject *value = _PyDict_GetItemId(
value = _PyDict_GetItemIdWithError(
xoptions, &PyId_importtime);
}
if (value == NULL && PyErr_Occurred()) {
goto error;
}
if (value != NULL || Py_IsInitialized()) {
ximporttime = (value == Py_True);
}
}
if (ximporttime) {
if (ximporttime > 0) {
fputs("import time: self [us] | cumulative | imported package\n",
stderr);
}
}

if (ximporttime) {
if (ximporttime > 0) {
import_level++;
t1 = _PyTime_GetPerfCounter();
accumulated = 0;
}

Py_XDECREF(mod);

if (PyDTrace_IMPORT_FIND_LOAD_START_ENABLED())
PyDTrace_IMPORT_FIND_LOAD_START(PyUnicode_AsUTF8(abs_name));

Expand All @@ -1717,7 +1724,7 @@ PyImport_ImportModuleLevelObject(PyObject *name, PyObject *globals,
PyDTrace_IMPORT_FIND_LOAD_DONE(PyUnicode_AsUTF8(abs_name),
mod != NULL);

if (ximporttime) {
if (ximporttime > 0) {
_PyTime_t cum = _PyTime_GetPerfCounter() - t1;

import_level--;
Expand Down