Skip to content

Commit

Permalink
bpo-43895: Remove an unnecessary cache of shared object handles (GH-2…
Browse files Browse the repository at this point in the history
…5487)

* Remove an unnecessary cache of shared object handles.
  • Loading branch information
insertinterestingnamehere committed Jul 7, 2021
1 parent 052930f commit fed2fc4
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 22 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
An obsolete internal cache of shared object file handles added in 1995 that
attempted, but did not guarantee, that a .so would not be dlopen'ed twice to
work around flaws in mid-1990s posix-ish operating systems has been removed
from dynload_shlib.c.
22 changes: 0 additions & 22 deletions Python/dynload_shlib.c
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,6 @@ const char *_PyImport_DynLoadFiletab[] = {
NULL,
};

static struct {
dev_t dev;
ino_t ino;
void *handle;
} handles[128];
static int nhandles = 0;


dl_funcptr
_PyImport_FindSharedFuncptr(const char *prefix,
Expand All @@ -77,22 +70,9 @@ _PyImport_FindSharedFuncptr(const char *prefix,
LEAD_UNDERSCORE "%.20s_%.200s", prefix, shortname);

if (fp != NULL) {
int i;
struct _Py_stat_struct status;
if (_Py_fstat(fileno(fp), &status) == -1)
return NULL;
for (i = 0; i < nhandles; i++) {
if (status.st_dev == handles[i].dev &&
status.st_ino == handles[i].ino) {
p = (dl_funcptr) dlsym(handles[i].handle,
funcname);
return p;
}
}
if (nhandles < 128) {
handles[nhandles].dev = status.st_dev;
handles[nhandles].ino = status.st_ino;
}
}

dlopenflags = _PyInterpreterState_GET()->dlopenflags;
Expand Down Expand Up @@ -126,8 +106,6 @@ _PyImport_FindSharedFuncptr(const char *prefix,
Py_DECREF(path);
return NULL;
}
if (fp != NULL && nhandles < 128)
handles[nhandles++].handle = handle;
p = (dl_funcptr) dlsym(handle, funcname);
return p;
}

0 comments on commit fed2fc4

Please sign in to comment.