Fix for hang after postmaster restart. Add new proc_exit and

shmem_exit to replace exitpg().

8 files changed, 80 insertions, 70 deletions

diff --git a/src/backend/storage/ipc/ipc.c b/src/backend/storage/ipc/ipc.c
index d301cdfe004..e1ef1119efb 100644
--- a/src/backend/storage/ipc/ipc.c
+++ b/src/backend/storage/ipc/ipc.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.26 1998/06/23 16:04:46 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.27 1998/06/27 04:53:34 momjian Exp $
  *
  * NOTES
  *
@@ -60,9 +60,9 @@ static struct ONEXIT
 {
 	void		(*function) ();
 	caddr_t		arg;
-}			onexit_list[MAX_ON_EXITS];
+}	on_proc_exit_list[MAX_ON_EXITS], on_shmem_exit_list[MAX_ON_EXITS];
 
-static int	onexit_index;
+static int	on_proc_exit_index, on_shmem_exit_index;
 static void IpcConfigTip(void);
 
 typedef struct _PrivateMemStruct
@@ -98,7 +98,7 @@ PrivateMemoryAttach(IpcMemoryId memid)
 
 
 /* ----------------------------------------------------------------
- *		exitpg
+ *		proc_exit
  *
  *		this function calls all the callbacks registered
  *		for it (to free resources) and then calls exit.
@@ -106,100 +106,124 @@ PrivateMemoryAttach(IpcMemoryId memid)
  *		-cim 2/6/90
  * ----------------------------------------------------------------
  */
-static int	exitpg_inprogress = 0;
+static int	proc_exit_inprogress = 0;
 
 void
-exitpg(int code)
+proc_exit(int code)
 {
 	int			i;
 
 	/* ----------------
-	 *	if exitpg_inprocess is true, then it means that we
+	 *	if proc_exit_inprocess is true, then it means that we
 	 *	are being invoked from within an on_exit() handler
 	 *	and so we return immediately to avoid recursion.
 	 * ----------------
 	 */
-	if (exitpg_inprogress)
+	if (proc_exit_inprogress)
 		return;
 
-	exitpg_inprogress = 1;
+	proc_exit_inprogress = 1;
 
+	/* do our shared memory exits first */
+	shmem_exit(code);
+	
 	/* ----------------
 	 *	call all the callbacks registered before calling exit().
 	 * ----------------
 	 */
-	for (i = onexit_index - 1; i >= 0; --i)
-		(*onexit_list[i].function) (code, onexit_list[i].arg);
+	for (i = on_proc_exit_index - 1; i >= 0; --i)
+		(*on_proc_exit_list[i].function) (code, on_proc_exit_list[i].arg);
 
 	exit(code);
 }
 
 /* ------------------
- * Run all of the on_exitpg routines but don't exit in the end.
+ * Run all of the on_shmem_exit routines but don't exit in the end.
  * This is used by the postmaster to re-initialize shared memory and
  * semaphores after a backend dies horribly
  * ------------------
  */
+static int	shmem_exit_inprogress = 0;
+
 void
-quasi_exitpg()
+shmem_exit(int code)
 {
 	int			i;
 
 	/* ----------------
-	 *	if exitpg_inprocess is true, then it means that we
+	 *	if shmem_exit_inprocess is true, then it means that we
 	 *	are being invoked from within an on_exit() handler
 	 *	and so we return immediately to avoid recursion.
 	 * ----------------
 	 */
-	if (exitpg_inprogress)
+	if (shmem_exit_inprogress)
 		return;
 
-	exitpg_inprogress = 1;
+	shmem_exit_inprogress = 1;
 
 	/* ----------------
 	 *	call all the callbacks registered before calling exit().
 	 * ----------------
 	 */
-	for (i = onexit_index - 1; i >= 0; --i)
-		/* Don't do StreamDoUnlink on quasi_exit */
-		if (onexit_list[i].function != StreamDoUnlink)
-			(*onexit_list[i].function) (0, onexit_list[i].arg);
+	for (i = on_shmem_exit_index - 1; i >= 0; --i)
+		(*on_shmem_exit_list[i].function) (code, on_shmem_exit_list[i].arg);
+
+	on_shmem_exit_index = 0;
+	shmem_exit_inprogress = 0;
+}
 
-	onexit_index = 0;
-	exitpg_inprogress = 0;
+/* ----------------------------------------------------------------
+ *		on_proc_exit
+ *
+ *		this function adds a callback function to the list of
+ *		functions invoked by proc_exit().	-cim 2/6/90
+ * ----------------------------------------------------------------
+ */
+int
+on_proc_exit(void (*function) (), caddr_t arg)
+{
+	if (on_proc_exit_index >= MAX_ON_EXITS)
+		return (-1);
+
+	on_proc_exit_list[on_proc_exit_index].function = function;
+	on_proc_exit_list[on_proc_exit_index].arg = arg;
+
+	++on_proc_exit_index;
+
+	return (0);
 }
 
 /* ----------------------------------------------------------------
- *		on_exitpg
+ *		on_shmem_exit
  *
  *		this function adds a callback function to the list of
- *		functions invoked by exitpg().	-cim 2/6/90
+ *		functions invoked by shmem_exit().	-cim 2/6/90
  * ----------------------------------------------------------------
  */
 int
-on_exitpg(void (*function) (), caddr_t arg)
+on_shmem_exit(void (*function) (), caddr_t arg)
 {
-	if (onexit_index >= MAX_ON_EXITS)
+	if (on_shmem_exit_index >= MAX_ON_EXITS)
 		return (-1);
 
-	onexit_list[onexit_index].function = function;
-	onexit_list[onexit_index].arg = arg;
+	on_shmem_exit_list[on_shmem_exit_index].function = function;
+	on_shmem_exit_list[on_shmem_exit_index].arg = arg;
 
-	++onexit_index;
+	++on_shmem_exit_index;
 
 	return (0);
 }
 
 /* ----------------------------------------------------------------
- *		clear_exitpg
+ *		clear_proc_exit
  *
- *		this function clears all exitpg() registered functions.
+ *		this function clears all proc_exit() registered functions.
  * ----------------------------------------------------------------
  */
 void
-clear_exitpg(void)
+clear_proc_exit(void)
 {
-	onexit_index = 0;
+	on_proc_exit_index = 0;
 }
 
 /****************************************************************************/
@@ -301,7 +325,7 @@ IpcSemaphoreCreate(IpcSemaphoreKey semKey,
 		{
 			perror("semget");
 			IpcConfigTip();
-			exitpg(3);
+			proc_exit(3);
 		}
 		for (i = 0; i < semNum; i++)
 			array[i] = semStartValue;
@@ -314,7 +338,7 @@ IpcSemaphoreCreate(IpcSemaphoreKey semKey,
 		}
 
 		if (removeOnExit)
-			on_exitpg(IPCPrivateSemaphoreKill, (caddr_t) semId);
+			on_shmem_exit(IPCPrivateSemaphoreKill, (caddr_t) semId);
 
 	}
 	else
@@ -418,7 +442,7 @@ IpcSemaphoreLock(IpcSemaphoreId semId, int sem, int lock)
 	{
 		perror("semop");
 		IpcConfigTip();
-		exitpg(255);
+		proc_exit(255);
 	}
 }
 
@@ -463,7 +487,7 @@ IpcSemaphoreUnlock(IpcSemaphoreId semId, int sem, int lock)
 	{
 		perror("semop");
 		IpcConfigTip();
-		exitpg(255);
+		proc_exit(255);
 	}
 }
 
@@ -517,7 +541,7 @@ IpcMemoryCreate(IpcMemoryKey memKey, uint32 size, int permission)
 	}
 
 	/* if (memKey == PrivateIPCKey) */
-	on_exitpg(IPCPrivateMemoryKill, (caddr_t) shmid);
+	on_shmem_exit(IPCPrivateMemoryKill, (caddr_t) shmid);
 
 	return (shmid);
 }
@@ -583,7 +607,7 @@ IpcMemoryAttach(IpcMemoryId memId)
 	}
 
 	if (!UsePrivateMemory)
-		on_exitpg(IpcMemoryDetach, (caddr_t) memAddress);
+		on_shmem_exit(IpcMemoryDetach, (caddr_t) memAddress);
 
 	return ((char *) memAddress);
 }
diff --git a/src/backend/storage/ipc/ipci.c b/src/backend/storage/ipc/ipci.c
index e8aabe5a74f..4bcc15efd2e 100644
--- a/src/backend/storage/ipc/ipci.c
+++ b/src/backend/storage/ipc/ipci.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipci.c,v 1.13 1998/06/26 19:57:48 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipci.c,v 1.14 1998/06/27 04:53:35 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -92,7 +92,6 @@ CreateSharedMemoryAndSemaphores(IPCKey key)
 	 * ----------------
 	 */
 	InitLocks();
-	InitMultiLevelLocks();
 	if (InitMultiLevelLocks() == INVALID_TABLEID)
 		elog(FATAL, "Couldn't create the lock table");
 
@@ -101,7 +100,7 @@ CreateSharedMemoryAndSemaphores(IPCKey key)
 	 * ----------------
 	 */
 	InitProcGlobal(key);
-	on_exitpg(ProcFreeAllSemaphores, NULL);
+	on_shmem_exit(ProcFreeAllSemaphores, NULL);
 
 	CreateSharedInvalidationState(key);
 }
diff --git a/src/backend/storage/ipc/shmem.c b/src/backend/storage/ipc/shmem.c
index 431edc6ff7d..6bf0a500a31 100644
--- a/src/backend/storage/ipc/shmem.c
+++ b/src/backend/storage/ipc/shmem.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmem.c,v 1.22 1998/06/25 14:24:34 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmem.c,v 1.23 1998/06/27 04:53:36 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -524,7 +524,7 @@ ShmemInitStruct(char *name, unsigned long size, bool *foundPtr)
 	}
 	else
 	{
-		/* look it up in the bindint table */
+		/* look it up in the binding table */
 		result = (BindingEnt *)
 			hash_search(BindingTable, (char *) &item, HASH_ENTER, foundPtr);
 	}
diff --git a/src/backend/storage/ipc/sinvaladt.c b/src/backend/storage/ipc/sinvaladt.c
index bca6dcee165..b54f4dc2211 100644
--- a/src/backend/storage/ipc/sinvaladt.c
+++ b/src/backend/storage/ipc/sinvaladt.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinvaladt.c,v 1.10 1998/06/18 04:20:34 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinvaladt.c,v 1.11 1998/06/27 04:53:36 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -100,7 +100,7 @@ SIBackendInit(SISeg *segInOutP)
 #endif							/* INVALIDDEBUG */
 
 	SISetActiveProcess(segInOutP, MyBackendId);
-	on_exitpg(CleanupInvalidationState, (caddr_t) segInOutP);
+	on_shmem_exit(CleanupInvalidationState, (caddr_t) segInOutP);
 	return 1;
 }
 
@@ -193,7 +193,7 @@ SISetDeadProcess(SISeg *segP, int backendId)
  * CleanupInvalidationState --
  * Note:
  *		This is a temporary hack.  ExitBackend should call this instead
- *		of exit (via on_exitpg).
+ *		of exit (via on_shmem_exit).
  */
 static void
 CleanupInvalidationState(int status,	/* XXX */
diff --git a/src/backend/storage/lmgr/lock.c b/src/backend/storage/lmgr/lock.c
index ab8b7b82584..191ee71f878 100644
--- a/src/backend/storage/lmgr/lock.c
+++ b/src/backend/storage/lmgr/lock.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.28 1998/06/26 01:58:45 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.29 1998/06/27 04:53:37 momjian Exp $
  *
  * NOTES
  *	  Outside modules can create a lock table and acquire/release
@@ -153,7 +153,7 @@ static LOCKTAB *AllTables[MAX_TABLES];
  * no zero-th table
  * -------------------
  */
-static int	NumTables = 1;
+static int	NumTables;
 
 /* -------------------
  * InitLocks -- Init the lock module.  Create a private data
@@ -242,14 +242,6 @@ LockTableInit(char *tabName,
 		return (INVALID_TABLEID);
 	}
 
-	if (NumTables > MAX_TABLES)
-	{
-		elog(NOTICE,
-			 "LockTableInit: system limit of MAX_TABLES (%d) lock tables",
-			 MAX_TABLES);
-		return (INVALID_TABLEID);
-	}
-
 	/* allocate a string for the binding table lookup */
 	shmemName = (char *) palloc((unsigned) (strlen(tabName) + 32));
 	if (!shmemName)
@@ -289,6 +281,8 @@ LockTableInit(char *tabName,
 		status = FALSE;
 	}
 
+	NumTables = 1;
+
 	/* ----------------
 	 * we're first - initialize
 	 * ----------------
diff --git a/src/backend/storage/lmgr/multi.c b/src/backend/storage/lmgr/multi.c
index 135996432a9..19682ffe95c 100644
--- a/src/backend/storage/lmgr/multi.c
+++ b/src/backend/storage/lmgr/multi.c
@@ -12,7 +12,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Attic/multi.c,v 1.16 1998/06/26 19:57:49 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Attic/multi.c,v 1.17 1998/06/27 04:53:38 momjian Exp $
  *
  * NOTES:
  *	 (1) The lock.c module assumes that the caller here is doing
@@ -89,13 +89,6 @@ InitMultiLevelLocks()
 {
 	int			tableId;
 
-	/* -----------------------
-	 * If we're already initialized just return the table id.
-	 * -----------------------
-	 */
-	if (MultiTableId)
-		return MultiTableId;
-
 	tableId = LockTableInit("LockTable", MultiConflicts, MultiPrios, 5);
 	MultiTableId = tableId;
 	if (!(MultiTableId))
diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c
index d6ef6f9e7af..559542ed8af 100644
--- a/src/backend/storage/lmgr/proc.c
+++ b/src/backend/storage/lmgr/proc.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.36 1998/06/19 02:55:11 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.37 1998/06/27 04:53:39 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -46,7 +46,7 @@
  *		This is so that we can support more backends. (system-wide semaphore
  *		sets run out pretty fast.)				  -ay 4/95
  *
- * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.36 1998/06/19 02:55:11 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.37 1998/06/27 04:53:39 momjian Exp $
  */
 #include <sys/time.h>
 #include <unistd.h>
@@ -274,7 +274,7 @@ InitProcess(IPCKey key)
 	MyProc->errType = NO_ERROR;
 	SHMQueueElemInit(&(MyProc->links));
 
-	on_exitpg(ProcKill, (caddr_t) MyProcPid);
+	on_shmem_exit(ProcKill, (caddr_t) MyProcPid);
 
 	ProcInitialized = TRUE;
 }
diff --git a/src/backend/storage/smgr/smgr.c b/src/backend/storage/smgr/smgr.c
index 4960eebe164..f96e7aa0988 100644
--- a/src/backend/storage/smgr/smgr.c
+++ b/src/backend/storage/smgr/smgr.c
@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgr.c,v 1.16 1998/06/23 15:35:45 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgr.c,v 1.17 1998/06/27 04:53:40 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -100,7 +100,7 @@ smgrinit()
 	}
 
 	/* register the shutdown proc */
-	on_exitpg(smgrshutdown, NULL);
+	on_proc_exit(smgrshutdown, NULL);
 
 	return (SM_SUCCESS);
 }