rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

load_file() has to remove pre-existing shlibs that match the new file 

on either name or inode; otherwise load_external_function() won't do
anything.  At least on Linux, it appears that recompiling a shlib leads
to a new file with a different inode, so the old code failed to detect
a match.
This commit is contained in:
Tom Lane 2003-09-07 02:18:01 +00:00
parent 3e20a72603
commit f4ed650996
1 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/backend/utils/fmgr/dfmgr.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.64 2003/08/04 02:40:06 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.65 2003/09/07 02:18:01 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -96,7 +96,8 @@ load_external_function(char *filename, char *funcname,
if (stat(fullname, &stat_buf) == -1) if (stat(fullname, &stat_buf) == -1)
ereport(ERROR, ereport(ERROR,
(errcode_for_file_access(), (errcode_for_file_access(),
errmsg("could not access file \"%s\": %m", fullname))); errmsg("could not access file \"%s\": %m",
fullname)));
for (file_scanner = file_list; for (file_scanner = file_list;
file_scanner != (DynamicFileList *) NULL && file_scanner != (DynamicFileList *) NULL &&
@ -177,7 +178,8 @@ void
load_file(char *filename) load_file(char *filename)
{ {
DynamicFileList *file_scanner, DynamicFileList *file_scanner,
*p; *prv,
*nxt;
struct stat stat_buf; struct stat stat_buf;
char *fullname; char *fullname;
@ -196,31 +198,27 @@ load_file(char *filename)
(errcode_for_file_access(), (errcode_for_file_access(),
errmsg("could not access file \"%s\": %m", fullname))); errmsg("could not access file \"%s\": %m", fullname)));
if (file_list != (DynamicFileList *) NULL) /*
* We have to zap all entries in the list that match on either filename
* or inode, else load_external_function() won't do anything.
*/
prv = NULL;
for (file_scanner = file_list; file_scanner != NULL; file_scanner = nxt)
{ {
if (SAME_INODE(stat_buf, *file_list)) nxt = file_scanner->next;
if (strcmp(fullname, file_scanner->filename) == 0 ||
SAME_INODE(stat_buf, *file_scanner))
{ {
p = file_list; if (prv)
file_list = p->next; prv->next = nxt;
pg_dlclose(p->handle); else
free((char *) p); file_list = nxt;
pg_dlclose(file_scanner->handle);
free((char *) file_scanner);
/* prv does not change */
} }
else else
{ prv = file_scanner;
for (file_scanner = file_list;
file_scanner->next != (DynamicFileList *) NULL;
file_scanner = file_scanner->next)
{
if (SAME_INODE(stat_buf, *(file_scanner->next)))
{
p = file_scanner->next;
file_scanner->next = p->next;
pg_dlclose(p->handle);
free((char *) p);
break;
}
}
}
} }
load_external_function(fullname, (char *) NULL, false, (void *) NULL); load_external_function(fullname, (char *) NULL, false, (void *) NULL);