Index: doc/src/sgml/ref/vacuum.sgml
===================================================================
RCS file: /home/projects/pgsql/cvsroot/pgsql/doc/src/sgml/ref/vacuum.sgml,v
retrieving revision 1.16
diff -c -r1.16 vacuum.sgml
*** doc/src/sgml/ref/vacuum.sgml 2001/05/25 15:45:31 1.16
--- doc/src/sgml/ref/vacuum.sgml 2001/05/28 19:06:30
***************
*** 154,160 ****
With no parameter, VACUUM processes every table in the
! current database. With a parameter, VACUUM processes
only that table.
--- 154,161 ----
With no parameter, VACUUM processes every table in the
! current database. It also detects extraneous files in the
! database directory. With a parameter, VACUUM processes
only that table.
Index: src/backend/commands/vacuum.c
===================================================================
RCS file: /home/projects/pgsql/cvsroot/pgsql/src/backend/commands/vacuum.c,v
retrieving revision 1.195
diff -c -r1.195 vacuum.c
*** src/backend/commands/vacuum.c 2001/05/25 15:45:32 1.195
--- src/backend/commands/vacuum.c 2001/05/28 19:06:33
***************
*** 16,24 ****
--- 16,27 ----
#include
#include
+ #include
+ #include
#include
#include
#include
+ #include
#include
#include
***************
*** 30,42 ****
--- 33,48 ----
#include "access/genam.h"
#include "access/heapam.h"
+ #include "access/transam.h"
#include "access/xlog.h"
#include "catalog/catalog.h"
#include "catalog/catname.h"
+ #include "catalog/heap.h"
#include "catalog/index.h"
#include "commands/vacuum.h"
#include "miscadmin.h"
#include "nodes/execnodes.h"
+ #include "storage/fd.h"
#include "storage/sinval.h"
#include "storage/smgr.h"
#include "tcop/tcopprot.h"
***************
*** 159,164 ****
--- 165,175 ----
static bool enough_space(VacPage vacpage, Size len);
static void init_rusage(VacRUsage *ru0);
static char *show_rusage(VacRUsage *ru0);
+ static void remove_sorttemp_files(void);
+ static void remove_temp_tables(void);
+ static void report_orphaned_files(void);
+ static Oid *get_pgclass_relfilenodes(Size *num_relfilenodes);
+ static int vc_oidcmp(const void *a, const void* b);
/*
***************
*** 236,241 ****
--- 247,260 ----
/* clean up */
vacuum_shutdown();
+
+ if (VacRelName == NULL)
+ {
+ remove_sorttemp_files();
+ report_orphaned_files();
+ remove_temp_tables();
+ }
+
}
/*
***************
*** 2645,2648 ****
--- 2664,2916 ----
(int) (ru1.tv.tv_usec - ru0->tv.tv_usec) / 10000);
return result;
+ }
+
+ /*
+ * remove_sorttemp_files
+ *
+ * Remove sorttemp files not referenced by any running backend.
+ * This could be caused by backend crash not cleaning up.
+ */
+ static void
+ remove_sorttemp_files(void)
+ {
+ DIR *temp_dir;
+ struct dirent *temp_de;
+ char cwd[MAXPGPATH];
+ char temp_path[MAXPGPATH];
+ int pid;
+
+ getcwd(cwd,MAXPGPATH);
+ temp_dir = opendir(SORT_TEMP_DIR);
+ if (!temp_dir) /* if there is no directory, nothing to do */
+ return;
+
+ /*
+ * Cycle through directory and check each file against
+ * pg_class.relfilenode.
+ */
+ while ((temp_de = readdir(temp_dir)) != NULL)
+ {
+ if (strcmp(temp_de->d_name,".") == 0 ||
+ strcmp(temp_de->d_name,"..") == 0)
+ continue;
+ if (strspn(temp_de->d_name, "0123456789.") !=
+ strlen(temp_de->d_name))
+ /* Non-numeric file names */
+ elog(NOTICE,
+ "Unusual file found in temporary sort directory. This file is not\n"
+ "\t normally created by PostgreSQL and can be removed by the\n"
+ "\t administrator using 'rm':\n\t %s/%s/%s",
+ cwd, SORT_TEMP_DIR, temp_de->d_name);
+ else
+ {
+ /* Numeric file names; extents clip off decimal point */
+ pid = atoi(temp_de->d_name);
+ if (pid == 0)
+ elog(NOTICE,
+ "Unusual file found in temporary sort directory. This file is not\n"
+ "\t normally created by PostgreSQL and can be removed by the\n"
+ "\t administrator using 'rm':\n\t %s/%s/%s",
+ cwd, SORT_TEMP_DIR, temp_de->d_name);
+ else if (ShmemPIDLookup(pid) == NULL)
+ {
+ snprintf(temp_path, MAXPGPATH,
+ "%s/%s/%s", cwd, SORT_TEMP_DIR, temp_de->d_name);
+ unlink(temp_path);
+ }
+ }
+ }
+ closedir(temp_dir);
+ }
+
+ /*
+ * remove_temp_tables
+ *
+ * Remove temporary tables not referenced by any running backend.
+ */
+ static void
+ remove_temp_tables(void)
+ {
+ Relation rel;
+ TupleDesc tupdesc;
+ HeapScanDesc scan;
+ HeapTuple tuple;
+ Datum d;
+ bool n;
+ char *relname;
+ char relkind;
+ Oid reloid;
+ int pid;
+
+ rel = heap_openr(RelationRelationName, AccessShareLock);
+
+ tupdesc = RelationGetDescr(rel);
+
+ scan = heap_beginscan(rel, false, SnapshotNow, 0, (ScanKey) NULL);
+ while (HeapTupleIsValid(tuple = heap_getnext(scan, 0)))
+ {
+ d = heap_getattr(tuple, Anum_pg_class_relname, tupdesc, &n);
+ relname = (char *) DatumGetName(d);
+ d = heap_getattr(tuple, Anum_pg_class_relkind, tupdesc, &n);
+ relkind = DatumGetChar(d);
+ reloid = tuple->t_data->t_oid;
+
+ if (strncmp(relname,"pg_temp.", strlen("pg_temp.")) == 0)
+ {
+ if ((pid = atoi(&relname[8])) != 0 &&
+ ShmemPIDLookup(pid) == NULL)
+ {
+ if (relkind != RELKIND_INDEX)
+ heap_drop_with_catalog(relname, true);
+ else
+ index_drop(reloid);
+ }
+ CommandCounterIncrement();
+ }
+ }
+ heap_endscan(scan);
+ heap_close(rel, AccessShareLock);
+ }
+
+
+ /*
+ * report_orphaned_files
+ *
+ * Report files that are not referenced by any pg_class.relfilenode.
+ * This could be caused by backend crash not cleaning up.
+ */
+ static void
+ report_orphaned_files(void)
+ {
+ DIR *db_dir;
+ struct dirent *db_de;
+ Oid dir_file_oid;
+ char cwd[MAXPGPATH];
+ Size num_relfilenodes = 0;
+ Oid *relfilenodes = get_pgclass_relfilenodes(&num_relfilenodes);
+
+ getcwd(cwd,MAXPGPATH);
+ db_dir = opendir(".");
+ Assert(db_dir);
+
+ /*
+ * Cycle through directory and check each file against
+ * pg_class.relfilenode.
+ */
+ while ((db_de = readdir(db_dir)) != NULL)
+ {
+ if (strcmp(db_de->d_name,".") == 0 ||
+ strcmp(db_de->d_name,"..") == 0)
+ continue;
+ if (strspn(db_de->d_name, "0123456789.") !=
+ strlen(db_de->d_name))
+ {
+ /* Non-numeric file names */
+ if (strcmp(db_de->d_name, "core") == 0)
+ elog(NOTICE,
+ "Core file found in database directory. If you don't need it\n"
+ "\t for debugging, the administrator can remove it using 'rm':\n\t %s/%s",
+ cwd, db_de->d_name);
+ else if (strcmp(db_de->d_name, SORT_TEMP_DIR) != 0 &&
+ strcmp(db_de->d_name, PG_VERSION_FILE) != 0 &&
+ strcmp(db_de->d_name, RELCACHE_INIT_FILENAME) != 0)
+ elog(NOTICE,
+ "Unusual file found in database directory. This file is not\n"
+ "\t normally created by PostgreSQL and can be removed by the\n"
+ "\t administrator using 'rm':\n\t %s/%s",
+ cwd, db_de->d_name);
+ }
+ else
+ {
+ /* Numeric file names; extents, clip off decimal point */
+ dir_file_oid = (Oid) strtoul((db_de->d_name), NULL, 10);
+
+ if (/* oid not found in pg_class */
+ bsearch(&dir_file_oid, relfilenodes, num_relfilenodes,
+ sizeof(Oid), vc_oidcmp) == NULL)
+ elog(NOTICE,
+ "Unreferenced table file found in database directory. This\n"
+ "\t could have been left from a database crash. If no one was\n"
+ "\t using the database during VACUUM, the file can be safely\n"
+ "\t removed by the administrator using 'rm':\n\t %s/%s",
+ cwd, db_de->d_name);
+ /* Maybe one day we can unlink too. bjm 2001-05-24 */
+ }
+ }
+ pfree(relfilenodes);
+ closedir(db_dir);
+ }
+
+
+ /*
+ * get_pgclass_relfilenodes
+ *
+ * Return sorted array of Oid's referenced by pg_class.relfilenodes.
+ */
+ static Oid *
+ get_pgclass_relfilenodes(Size *num_relfilenodes)
+ {
+ Relation rel;
+ TupleDesc tupdesc;
+ HeapScanDesc scan;
+ HeapTuple tuple;
+ Datum d;
+ bool n;
+ Oid *relfilenodes = NULL;
+ int len = 0;
+ Oid rel_file_oid;
+
+ rel = heap_openr(RelationRelationName, AccessShareLock);
+
+ tupdesc = RelationGetDescr(rel);
+
+ /*
+ * Make all tuples visible. This doesn't hurt.
+ * If we miss an orphan now, we can report on it later.
+ */
+ scan = heap_beginscan(rel, false, SnapshotAny, 0, (ScanKey) NULL);
+ while (HeapTupleIsValid(tuple = heap_getnext(scan, 0)))
+ {
+ d = heap_getattr(tuple, Anum_pg_class_relfilenode, tupdesc, &n);
+ rel_file_oid = DatumGetObjectId(d);
+ if (*num_relfilenodes >= len)
+ {
+ if (len == 0)
+ {
+ len = 100;
+ relfilenodes = palloc(len * sizeof(Oid));
+ }
+ else
+ {
+ len *= 2;
+ relfilenodes = repalloc(relfilenodes, len * sizeof(Oid));
+ }
+ }
+ relfilenodes[*num_relfilenodes] = rel_file_oid;
+ (*num_relfilenodes)++;
+ }
+ heap_endscan(scan);
+ heap_close(rel, AccessShareLock);
+
+ qsort(relfilenodes, *num_relfilenodes, sizeof(Oid), vc_oidcmp);
+
+ return relfilenodes;
+ }
+
+
+ /*
+ * vc_oidcmp
+ *
+ * Used by qsort() above.
+ */
+ static int
+ vc_oidcmp(const void *a, const void* b)
+ {
+ if (*(Oid *)a > *(Oid *)b)
+ return 1;
+ else if (*(Oid *)a == *(Oid *)b)
+ return 0;
+ else
+ return -1;
}
Index: src/backend/postmaster/postmaster.c
===================================================================
RCS file: /home/projects/pgsql/cvsroot/pgsql/src/backend/postmaster/postmaster.c,v
retrieving revision 1.214
diff -c -r1.214 postmaster.c
*** src/backend/postmaster/postmaster.c 2001/05/25 15:45:33 1.214
--- src/backend/postmaster/postmaster.c 2001/05/28 19:06:34
***************
*** 58,63 ****
--- 58,64 ----
#include
#include
#include
+ #include
#include
#include
#include
***************
*** 243,248 ****
--- 244,250 ----
static void SignalChildren(int signal);
static int CountChildren(void);
static bool CreateOptsFile(int argc, char *argv[]);
+ static void RemovePgSorttemp(void);
static pid_t SSDataBase(int xlop);
***************
*** 595,600 ****
--- 597,605 ----
if (!CreateDataDirLockFile(DataDir, true))
ExitPostmaster(1);
+ /* Remove old sort files */
+ RemovePgSorttemp();
+
/*
* Establish input sockets.
*/
***************
*** 2449,2452 ****
--- 2454,2506 ----
fclose(fp);
return true;
+ }
+
+
+ /*
+ * Remove old sort files
+ * This is done per database by VACUUM too.
+ */
+ static void
+ RemovePgSorttemp(void)
+ {
+ char db_path[MAXPGPATH];
+ char temp_path[MAXPGPATH];
+ char rm_path[MAXPGPATH];
+ DIR *db_dir;
+ DIR *temp_dir;
+ struct dirent *db_de;
+ struct dirent *temp_de;
+
+
+ /*
+ * Cycle through pg_tempsort for all databases and
+ * and remove old sort files.
+ */
+ snprintf(db_path, sizeof(db_path), "%s/base", DataDir);
+ if ((db_dir = opendir(db_path)) != NULL)
+ {
+ while ((db_de = readdir(db_dir)) != NULL)
+ {
+ snprintf(temp_path, sizeof(temp_path),
+ "%s/%s/%s", db_path, db_de->d_name, SORT_TEMP_DIR);
+ if ((temp_dir = opendir(temp_path)) != NULL)
+ {
+ while ((temp_de = readdir(temp_dir)) != NULL)
+ {
+ snprintf(rm_path, sizeof(temp_path),
+ "%s/%s/%s/%s",
+ db_path, db_de->d_name,
+ SORT_TEMP_DIR, temp_de->d_name);
+ if (strspn(temp_de->d_name, "0123456789.") ==
+ strlen(temp_de->d_name))
+ unlink(rm_path);
+ else
+ fprintf(stderr,"Unexpected file found while cleaning temporary sort directory:\n\t %s\n", rm_path);
+ }
+ closedir(temp_dir);
+ }
+ }
+ closedir(db_dir);
+ }
}
Index: src/backend/storage/file/fd.c
===================================================================
RCS file: /home/projects/pgsql/cvsroot/pgsql/src/backend/storage/file/fd.c,v
retrieving revision 1.78
diff -c -r1.78 fd.c
*** src/backend/storage/file/fd.c 2001/05/25 15:45:33 1.78
--- src/backend/storage/file/fd.c 2001/05/28 19:06:38
***************
*** 742,762 ****
File
OpenTemporaryFile(void)
{
! char tempfilename[64];
File file;
/*
* Generate a tempfile name that's unique within the current
* transaction
*/
! snprintf(tempfilename, sizeof(tempfilename),
! "pg_sorttemp%d.%ld", MyProcPid, tempFileCounter++);
/* Open the file */
! file = FileNameOpenFile(tempfilename,
O_RDWR | O_CREAT | O_TRUNC | PG_BINARY, 0600);
if (file <= 0)
! elog(ERROR, "Failed to create temporary file %s", tempfilename);
/* Mark it for deletion at close or EOXact */
VfdCache[file].fdstate |= FD_TEMPORARY;
--- 742,770 ----
File
OpenTemporaryFile(void)
{
! char tempfilepath[128];
File file;
/*
* Generate a tempfile name that's unique within the current
* transaction
*/
! snprintf(tempfilepath, sizeof(tempfilepath),
! "%s%c%d.%ld", SORT_TEMP_DIR, SEP_CHAR, MyProcPid,
! tempFileCounter++);
/* Open the file */
! file = FileNameOpenFile(tempfilepath,
O_RDWR | O_CREAT | O_TRUNC | PG_BINARY, 0600);
if (file <= 0)
! {
! /* mkdir could fail if some one else already created it */
! mkdir(SORT_TEMP_DIR, S_IRWXU);
! file = FileNameOpenFile(tempfilepath,
! O_RDWR | O_CREAT | O_TRUNC | PG_BINARY, 0600);
! if (file <= 0)
! elog(ERROR, "Failed to create temporary file %s", tempfilepath);
! }
/* Mark it for deletion at close or EOXact */
VfdCache[file].fdstate |= FD_TEMPORARY;
Index: src/backend/storage/ipc/shmem.c
===================================================================
RCS file: /home/projects/pgsql/cvsroot/pgsql/src/backend/storage/ipc/shmem.c,v
retrieving revision 1.57
diff -c -r1.57 shmem.c
*** src/backend/storage/ipc/shmem.c 2001/03/22 03:59:45 1.57
--- src/backend/storage/ipc/shmem.c 2001/05/28 19:06:38
***************
*** 260,276 ****
}
/*
! * ShmemPIDLookup -- lookup process data structure using process id
*
! * Returns: TRUE if no error. locationPtr is initialized if PID is
! * found in the shmem index.
*
- * NOTES:
- * only information about success or failure is the value of
- * locationPtr.
*/
! bool
! ShmemPIDLookup(int pid, SHMEM_OFFSET *locationPtr)
{
ShmemIndexEnt *result,
item;
--- 260,272 ----
}
/*
! * ShmemPIDLookup -- lookup process structure using process id
*
! * Returns shared memory pointer or NULL.
*
*/
! SHMEM_OFFSET
! ShmemPIDLookup(int pid)
{
ShmemIndexEnt *result,
item;
***************
*** 283,305 ****
SpinAcquire(ShmemIndexLock);
result = (ShmemIndexEnt *)
! hash_search(ShmemIndex, (char *) &item, HASH_ENTER, &found);
if (!result)
{
SpinRelease(ShmemIndexLock);
elog(ERROR, "ShmemInitPID: ShmemIndex corrupted");
- return FALSE;
}
if (found)
! *locationPtr = result->location;
else
result->location = *locationPtr;
SpinRelease(ShmemIndexLock);
! return TRUE;
}
/*
* ShmemPIDDestroy -- destroy shmem index entry for process
--- 279,337 ----
SpinAcquire(ShmemIndexLock);
result = (ShmemIndexEnt *)
! hash_search(ShmemIndex, (char *) &item, HASH_FIND, &found);
if (!result)
{
SpinRelease(ShmemIndexLock);
elog(ERROR, "ShmemInitPID: ShmemIndex corrupted");
}
+ SpinRelease(ShmemIndexLock);
+
if (found)
! return result->location;
else
+ return NULL;
+ }
+
+
+ /*
+ * ShmemPIDAdd -- add process id to shared memory.
+ *
+ * Returns boolean indicating success/failure.
+ *
+ */
+ bool
+ ShmemPIDAdd(int pid, SHMEM_OFFSET *locationPtr)
+ {
+ ShmemIndexEnt *result,
+ item;
+ bool found;
+
+ Assert(ShmemIndex);
+ MemSet(item.key, 0, SHMEM_INDEX_KEYSIZE);
+ sprintf(item.key, "PID %d", pid);
+
+ SpinAcquire(ShmemIndexLock);
+
+ result = (ShmemIndexEnt *)
+ hash_search(ShmemIndex, (char *) &item,
+ HASH_ENTER, &found);
+
+ if (!result)
+ {
+ SpinRelease(ShmemIndexLock);
+ elog(ERROR, "ShmemInitPID: ShmemIndex corrupted");
+ }
+
+ if (!found)
result->location = *locationPtr;
SpinRelease(ShmemIndexLock);
! return !found;
}
+
/*
* ShmemPIDDestroy -- destroy shmem index entry for process
Index: src/backend/storage/lmgr/lock.c
===================================================================
RCS file: /home/projects/pgsql/cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v
retrieving revision 1.88
diff -c -r1.88 lock.c
*** src/backend/storage/lmgr/lock.c 2001/03/22 03:59:46 1.88
--- src/backend/storage/lmgr/lock.c 2001/05/28 19:06:40
***************
*** 1458,1465 ****
int lockmethod = DEFAULT_LOCKMETHOD;
LOCKMETHODTABLE *lockMethodTable;
! ShmemPIDLookup(MyProcPid, &location);
! if (location == INVALID_OFFSET)
return;
proc = (PROC *) MAKE_PTR(location);
if (proc != MyProc)
--- 1458,1465 ----
int lockmethod = DEFAULT_LOCKMETHOD;
LOCKMETHODTABLE *lockMethodTable;
! if ((location = ShmemPIDLookup(MyProcPid)) == NULL ||
! location == INVALID_OFFSET)
return;
proc = (PROC *) MAKE_PTR(location);
if (proc != MyProc)
***************
*** 1508,1515 ****
HASH_SEQ_STATUS status;
pid = getpid();
! ShmemPIDLookup(pid, &location);
! if (location == INVALID_OFFSET)
return;
proc = (PROC *) MAKE_PTR(location);
if (proc != MyProc)
--- 1508,1515 ----
HASH_SEQ_STATUS status;
pid = getpid();
! If ((location = ShmemPIDLookup(pid)) == NULL ||
! location == INVALID_OFFSET)
return;
proc = (PROC *) MAKE_PTR(location);
if (proc != MyProc)
Index: src/backend/storage/lmgr/proc.c
===================================================================
RCS file: /home/projects/pgsql/cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v
retrieving revision 1.102
diff -c -r1.102 proc.c
*** src/backend/storage/lmgr/proc.c 2001/05/25 15:45:33 1.102
--- src/backend/storage/lmgr/proc.c 2001/05/28 19:06:40
***************
*** 276,283 ****
* process to find us after any untimely exit.
*/
location = MAKE_OFFSET(MyProc);
! if ((!ShmemPIDLookup(MyProcPid, &location)) ||
! (location != MAKE_OFFSET(MyProc)))
elog(STOP, "InitProcess: ShmemPID table broken");
/*
--- 276,283 ----
* process to find us after any untimely exit.
*/
location = MAKE_OFFSET(MyProc);
! if (!ShmemPIDAdd(MyProcPid, &location) ||
! location != MAKE_OFFSET(MyProc))
elog(STOP, "InitProcess: ShmemPID table broken");
/*
Index: src/backend/utils/cache/temprel.c
===================================================================
RCS file: /home/projects/pgsql/cvsroot/pgsql/src/backend/utils/cache/temprel.c,v
retrieving revision 1.35
diff -c -r1.35 temprel.c
*** src/backend/utils/cache/temprel.c 2001/03/22 03:59:58 1.35
--- src/backend/utils/cache/temprel.c 2001/05/28 19:06:47
***************
*** 230,236 ****
{
char relname[NAMEDATALEN];
! /* safe from deallocation */
strcpy(relname, NameStr(temp_rel->user_relname));
heap_drop_with_catalog(relname, allowSystemTableMods);
}
--- 230,236 ----
{
char relname[NAMEDATALEN];
! /* save from deallocation */
strcpy(relname, NameStr(temp_rel->user_relname));
heap_drop_with_catalog(relname, allowSystemTableMods);
}
Index: src/backend/utils/init/miscinit.c
===================================================================
RCS file: /home/projects/pgsql/cvsroot/pgsql/src/backend/utils/init/miscinit.c,v
retrieving revision 1.67
diff -c -r1.67 miscinit.c
*** src/backend/utils/init/miscinit.c 2001/05/18 17:49:52 1.67
--- src/backend/utils/init/miscinit.c 2001/05/28 19:06:47
***************
*** 824,830 ****
if (*endptr == '.')
my_minor = strtol(endptr + 1, NULL, 10);
! snprintf(full_path, MAXPGPATH, "%s/PG_VERSION", path);
file = AllocateFile(full_path, "r");
if (!file)
--- 824,830 ----
if (*endptr == '.')
my_minor = strtol(endptr + 1, NULL, 10);
! snprintf(full_path, MAXPGPATH, "%s/%s", path, PG_VERSION_FILE);
file = AllocateFile(full_path, "r");
if (!file)
Index: src/include/miscadmin.h
===================================================================
RCS file: /home/projects/pgsql/cvsroot/pgsql/src/include/miscadmin.h,v
retrieving revision 1.85
diff -c -r1.85 miscadmin.h
*** src/include/miscadmin.h 2001/05/12 01:48:49 1.85
--- src/include/miscadmin.h 2001/05/28 19:06:48
***************
*** 132,137 ****
--- 132,139 ----
extern int DebugLvl;
+ #define PG_VERSION_FILE "PG_VERSION"
+
/* Date/Time Configuration
*
* Constants to pass info from runtime environment:
Index: src/include/storage/fd.h
===================================================================
RCS file: /home/projects/pgsql/cvsroot/pgsql/src/include/storage/fd.h,v
retrieving revision 1.29
diff -c -r1.29 fd.h
*** src/include/storage/fd.h 2001/05/25 15:45:34 1.29
--- src/include/storage/fd.h 2001/05/28 19:06:49
***************
*** 39,44 ****
--- 39,46 ----
* FileSeek uses the standard UNIX lseek(2) flags.
*/
+ #define SORT_TEMP_DIR "pg_sorttemp"
+
typedef char *FileName;
typedef int File;
Index: src/include/storage/shmem.h
===================================================================
RCS file: /home/projects/pgsql/cvsroot/pgsql/src/include/storage/shmem.h,v
retrieving revision 1.28
diff -c -r1.28 shmem.h
*** src/include/storage/shmem.h 2001/03/22 04:01:09 1.28
--- src/include/storage/shmem.h 2001/05/28 19:06:49
***************
*** 71,77 ****
extern bool ShmemIsValid(unsigned long addr);
extern HTAB *ShmemInitHash(char *name, long init_size, long max_size,
HASHCTL *infoP, int hash_flags);
! extern bool ShmemPIDLookup(int pid, SHMEM_OFFSET *locationPtr);
extern SHMEM_OFFSET ShmemPIDDestroy(int pid);
extern void *ShmemInitStruct(char *name, Size size, bool *foundPtr);
--- 71,78 ----
extern bool ShmemIsValid(unsigned long addr);
extern HTAB *ShmemInitHash(char *name, long init_size, long max_size,
HASHCTL *infoP, int hash_flags);
! extern SHMEM_OFFSET ShmemPIDLookup(int pid);
! extern bool ShmemPIDAdd(int pid, SHMEM_OFFSET *locationPtr);
extern SHMEM_OFFSET ShmemPIDDestroy(int pid);
extern void *ShmemInitStruct(char *name, Size size, bool *foundPtr);