mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-29 06:05:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Need for speed: Patch #921466 : sys.path_importer_cache is now used to cache valid and

Browse source 
invalid file paths for the built-in import machinery which leads to
  fewer open calls on startup.

  Also fix issue with PEP 302 style import hooks which lead to more open()
  calls than necessary.
This commit is contained in:
Georg Brandl 2006-05-26 18:03:31 +00:00
parent 2d6c5a868a
commit f4ef11659c
3 changed files with 38 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

32
Python/import.c
View file

@ -1240,7 +1240,33 @@ find_module(char *fullname, char *subname, PyObject *path, char *buf,
if (importer == NULL)
return NULL;
/* Note: importer is a borrowed reference */
if (importer != Py_None) {
if (importer == Py_False) {
/* Cached as not being a valid dir. */
Py_XDECREF(copy);
continue;
}
else if (importer == Py_True) {
/* Cached as being a valid dir, so just
* continue below. */
}
else if (importer == Py_None) {
/* No importer was found, so it has to be a file.
* Check if the directory is valid. */
#ifdef HAVE_STAT
if (stat(buf, &statbuf) != 0) {
/* Directory does not exist. */
PyDict_SetItem(path_importer_cache,
v, Py_False);
Py_XDECREF(copy);
continue;
} else {
PyDict_SetItem(path_importer_cache,
v, Py_True);
}
#endif
}
else {
/* A real import hook importer was found. */
PyObject *loader;
loader = PyObject_CallMethod(importer,
"find_module",
@ -1253,9 +1279,11 @@ find_module(char *fullname, char *subname, PyObject *path, char *buf,
return &importhookdescr;
}
Py_DECREF(loader);
Py_XDECREF(copy);
continue;
}
/* no hook was successful, use builtin import */
}
/* no hook was found, use builtin import */
if (len > 0 && buf[len-1] != SEP
#ifdef ALTSEP