mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2025-01-06 15:24:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove an unused variable `ShmemBootstrap', and remove an obsolete

Browse Source 
comment. Patch from Alvaro.
This commit is contained in:
Neil Conway 2005-04-04 04:34:41 +00:00
parent 280de290d7
commit 5b1c607abe
1 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/backend/storage/ipc/shmem.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/storage/ipc/shmem.c,v 1.82 2004/12/31 22:00:56 pgsql Exp $ * $PostgreSQL: pgsql/src/backend/storage/ipc/shmem.c,v 1.83 2005/04/04 04:34:41 neilc Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -53,9 +53,6 @@
* cannot be redistributed to other tables. We could build a simple * cannot be redistributed to other tables. We could build a simple
* hash bucket garbage collector if need be. Right now, it seems * hash bucket garbage collector if need be. Right now, it seems
* unnecessary. * unnecessary.
*
* See InitSem() in sem.c for an example of how to use the
* shmem index.
*/ */
#include "postgres.h" #include "postgres.h"
@ -85,8 +82,6 @@ NON_EXEC_STATIC void *ShmemIndexAlloc = NULL; /* Memory actually
static HTAB *ShmemIndex = NULL; /* primary index hashtable for shmem */ static HTAB *ShmemIndex = NULL; /* primary index hashtable for shmem */
static bool ShmemBootstrap = false; /* bootstrapping shmem index? */
/* /*
* InitShmemAllocation() --- set up shared-memory allocation. * InitShmemAllocation() --- set up shared-memory allocation.
@ -213,10 +208,10 @@ InitShmemIndex(void)
/* /*
* Since ShmemInitHash calls ShmemInitStruct, which expects the * Since ShmemInitHash calls ShmemInitStruct, which expects the
* ShmemIndex hashtable to exist already, we have a bit of a * ShmemIndex hashtable to exist already, we have a bit of a
* circularity problem in initializing the ShmemIndex itself. We set * circularity problem in initializing the ShmemIndex itself. The
* ShmemBootstrap to tell ShmemInitStruct to fake it. * special "ShmemIndex" hash table name will tell ShmemInitStruct
* to fake it.
*/ */
ShmemBootstrap = true;
/* create the shared memory shmem index */ /* create the shared memory shmem index */
info.keysize = SHMEM_INDEX_KEYSIZE; info.keysize = SHMEM_INDEX_KEYSIZE;
@ -245,12 +240,11 @@ InitShmemIndex(void)
(errcode(ERRCODE_OUT_OF_MEMORY), (errcode(ERRCODE_OUT_OF_MEMORY),
errmsg("out of shared memory"))); errmsg("out of shared memory")));
Assert(ShmemBootstrap && !found); Assert(!found);
result->location = MAKE_OFFSET(ShmemIndex->hctl); result->location = MAKE_OFFSET(ShmemIndex->hctl);
result->size = SHMEM_INDEX_SIZE; result->size = SHMEM_INDEX_SIZE;
ShmemBootstrap = false;
} }
/* now release the lock acquired in ShmemInitStruct */ /* now release the lock acquired in ShmemInitStruct */
@ -349,11 +343,10 @@ ShmemInitStruct(const char *name, Size size, bool *foundPtr)
if (!ShmemIndex) if (!ShmemIndex)
{ {
Assert(strcmp(name, "ShmemIndex") == 0);
if (IsUnderPostmaster) if (IsUnderPostmaster)
{ {
/* Must be initializing a (non-standalone) backend */ /* Must be initializing a (non-standalone) backend */
Assert(strcmp(name, "ShmemIndex") == 0);
Assert(ShmemBootstrap);
Assert(ShmemIndexAlloc); Assert(ShmemIndexAlloc);
*foundPtr = TRUE; *foundPtr = TRUE;
} }
@ -366,8 +359,6 @@ ShmemInitStruct(const char *name, Size size, bool *foundPtr)
* Notice that the ShmemIndexLock is held until the shmem index * Notice that the ShmemIndexLock is held until the shmem index
* has been completely initialized. * has been completely initialized.
*/ */
Assert(strcmp(name, "ShmemIndex") == 0);
Assert(ShmemBootstrap);
*foundPtr = FALSE; *foundPtr = FALSE;
ShmemIndexAlloc = ShmemAlloc(size); ShmemIndexAlloc = ShmemAlloc(size);
} }