traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Check if we've already loaded a dynamic module under a different name.

This commit is contained in:
Sjoerd Mullender 1995-06-12 15:51:34 +00:00
parent 7d0bc8343f
commit fbe6d33ffd
3 changed files with 38 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Python/import.c
View File

@ -487,7 +487,7 @@ load_module(name)
break; break;
case C_EXTENSION: case C_EXTENSION:
m = load_dynamic_module(name, buf); m = load_dynamic_module(name, buf, fp);
break; break;
#ifdef macintosh #ifdef macintosh
@ -868,7 +868,7 @@ imp_load_dynamic(self, args)
object *dummy; object *dummy;
if (!newgetargs(args, "ss|O", &name, &pathname, &dummy)) if (!newgetargs(args, "ss|O", &name, &pathname, &dummy))
return NULL; return NULL;
return load_dynamic_module(name, pathname); return load_dynamic_module(name, pathname, NULL);
} }
static object * static object *

37
Python/importdl.c
View File

@ -127,6 +127,8 @@ static void aix_loaderror(char *name);
#ifdef DYNAMIC_LINK #ifdef DYNAMIC_LINK
#ifdef USE_SHLIB #ifdef USE_SHLIB
#include <sys/types.h>
#include <sys/stat.h>
#ifdef __NetBSD__ #ifdef __NetBSD__
#include <nlist.h> #include <nlist.h>
#include <link.h> #include <link.h>
@ -204,9 +206,10 @@ struct filedescr import_filetab[] = {
}; };
object * object *
load_dynamic_module(name, pathname) load_dynamic_module(name, pathname, fp)
char *name; char *name;
char *pathname; char *pathname;
FILE *fp;
{ {
#ifndef DYNAMIC_LINK #ifndef DYNAMIC_LINK
err_setstr(ImportError, "dynamically linked modules not supported"); err_setstr(ImportError, "dynamically linked modules not supported");
@ -215,7 +218,34 @@ load_dynamic_module(name, pathname)
object *m; object *m;
char funcname[258]; char funcname[258];
dl_funcptr p = NULL; dl_funcptr p = NULL;
#ifdef USE_SHLIB
static struct {
dev_t dev;
ino_t ino;
void *handle;
} handles[128];
static int nhandles = 0;
#endif
sprintf(funcname, FUNCNAME_PATTERN, name); sprintf(funcname, FUNCNAME_PATTERN, name);
#ifdef USE_SHLIB
if (fp != NULL) {
int i;
struct stat statb;
fstat(fileno(fp), &statb);
for (i = 0; i < nhandles; i++) {
if (statb.st_dev == handles[i].dev &&
statb.st_ino == handles[i].ino) {
p = (dl_funcptr) dlsym(handles[i].handle,
funcname);
goto got_it;
}
}
if (nhandles < 128) {
handles[nhandles].dev = statb.st_dev;
handles[nhandles].ino = statb.st_ino;
}
}
#endif /* USE_SHLIB */
#ifdef USE_MAC_SHARED_LIBRARY #ifdef USE_MAC_SHARED_LIBRARY
/* Dynamic loading of CFM shared libraries on the Mac */ /* Dynamic loading of CFM shared libraries on the Mac */
{ {
@ -255,6 +285,8 @@ load_dynamic_module(name, pathname)
err_setstr(ImportError, dlerror()); err_setstr(ImportError, dlerror());
return NULL; return NULL;
} }
if (fp != NULL && nhandles < 128)
handles[nhandles++].handle = handle;
p = (dl_funcptr) dlsym(handle, funcname); p = (dl_funcptr) dlsym(handle, funcname);
} }
#endif /* USE_SHLIB */ #endif /* USE_SHLIB */
@ -345,6 +377,7 @@ load_dynamic_module(name, pathname)
perror(funcname); perror(funcname);
} }
#endif /* hpux */ #endif /* hpux */
got_it:
if (p == NULL) { if (p == NULL) {
err_setstr(ImportError, err_setstr(ImportError,
"dynamic module does not define init function"); "dynamic module does not define init function");
@ -385,7 +418,7 @@ void aix_loaderror(char *pathname)
int errno; int errno;
char *errstr; char *errstr;
} load_errtab[] = { } load_errtab[] = {
{L_ERROR_TOOMANY, "to many errors, rest skipped."}, {L_ERROR_TOOMANY, "too many errors, rest skipped."},
{L_ERROR_NOLIB, "can't load library:"}, {L_ERROR_NOLIB, "can't load library:"},
{L_ERROR_UNDEF, "can't find symbol in library:"}, {L_ERROR_UNDEF, "can't find symbol in library:"},
{L_ERROR_RLDBAD, {L_ERROR_RLDBAD,

2
Python/importdl.h
View File

@ -37,6 +37,6 @@ extern struct filedescr {
extern object *import_modules; extern object *import_modules;
extern object *load_dynamic_module PROTO((char *name, char *pathname)); extern object *load_dynamic_module PROTO((char *name, char *pathname, FILE *));
extern int import_maxsuffixsize; extern int import_maxsuffixsize;