diff options
| author | Bruce Momjian <bruce@momjian.us> | 2003-12-20 17:31:21 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2003-12-20 17:31:21 +0000 |
| commit | d75b2ec4ebbc7fdb51088e89da47c6523bf2c640 (patch) | |
| tree | 4f0a12508b01da4d98c663bbdadb4a2e1ae6837a /src/backend/storage/freespace/freespace.c | |
| parent | 1ee0ddf91df31669ca0d07871d3f5aa88791b78d (diff) | |
This patch is the next step towards (re)allowing fork/exec.
Claudio Natoli
Diffstat (limited to 'src/backend/storage/freespace/freespace.c')
| -rw-r--r-- | src/backend/storage/freespace/freespace.c | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/src/backend/storage/freespace/freespace.c b/src/backend/storage/freespace/freespace.c index a7bffb5c733..84f5c65c928 100644 --- a/src/backend/storage/freespace/freespace.c +++ b/src/backend/storage/freespace/freespace.c @@ -8,7 +8,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/storage/freespace/freespace.c,v 1.27 2003/12/12 18:45:09 petere Exp $ + * $PostgreSQL: pgsql/src/backend/storage/freespace/freespace.c,v 1.28 2003/12/20 17:31:21 momjian Exp $ * * * NOTES: @@ -180,7 +180,6 @@ typedef struct FSMRelation FSMRelation; /* Header for whole map */ struct FSMHeader { - HTAB *relHash; /* hashtable of FSMRelation entries */ FSMRelation *usageList; /* FSMRelations in usage-recency order */ FSMRelation *usageListTail; /* tail of usage-recency list */ FSMRelation *firstRel; /* FSMRelations in arena storage order */ @@ -218,6 +217,7 @@ int MaxFSMRelations; /* these are set by guc.c */ int MaxFSMPages; static FSMHeader *FreeSpaceMap; /* points to FSMHeader in shared memory */ +static HTAB *FreeSpaceMapRelHash; /* points to (what used to be) FSMHeader->relHash */ static FSMRelation *lookup_fsm_rel(RelFileNode *rel); @@ -265,13 +265,15 @@ InitFreeSpaceMap(void) { HASHCTL info; int nchunks; + bool found; /* Create table header */ - FreeSpaceMap = (FSMHeader *) ShmemAlloc(sizeof(FSMHeader)); + FreeSpaceMap = (FSMHeader *) ShmemInitStruct("Free Space Map Header",sizeof(FSMHeader),&found); if (FreeSpaceMap == NULL) ereport(FATAL, (errcode(ERRCODE_OUT_OF_MEMORY), errmsg("insufficient shared memory for free space map"))); + if (!found) MemSet(FreeSpaceMap, 0, sizeof(FSMHeader)); /* Create hashtable for FSMRelations */ @@ -279,17 +281,21 @@ InitFreeSpaceMap(void) info.entrysize = sizeof(FSMRelation); info.hash = tag_hash; - FreeSpaceMap->relHash = ShmemInitHash("Free Space Map Hash", + FreeSpaceMapRelHash = ShmemInitHash("Free Space Map Hash", MaxFSMRelations / 10, MaxFSMRelations, &info, (HASH_ELEM | HASH_FUNCTION)); - if (!FreeSpaceMap->relHash) + if (!FreeSpaceMapRelHash) ereport(FATAL, (errcode(ERRCODE_OUT_OF_MEMORY), errmsg("insufficient shared memory for free space map"))); + if (found) + return; + + /* Allocate page-storage arena */ nchunks = (MaxFSMPages - 1) / CHUNKPAGES + 1; /* This check ensures spareChunks will be greater than zero */ @@ -974,7 +980,7 @@ lookup_fsm_rel(RelFileNode *rel) { FSMRelation *fsmrel; - fsmrel = (FSMRelation *) hash_search(FreeSpaceMap->relHash, + fsmrel = (FSMRelation *) hash_search(FreeSpaceMapRelHash, (void *) rel, HASH_FIND, NULL); @@ -995,7 +1001,7 @@ create_fsm_rel(RelFileNode *rel) FSMRelation *fsmrel; bool found; - fsmrel = (FSMRelation *) hash_search(FreeSpaceMap->relHash, + fsmrel = (FSMRelation *) hash_search(FreeSpaceMapRelHash, (void *) rel, HASH_ENTER, &found); @@ -1050,7 +1056,7 @@ delete_fsm_rel(FSMRelation *fsmrel) unlink_fsm_rel_usage(fsmrel); unlink_fsm_rel_storage(fsmrel); FreeSpaceMap->numRels--; - result = (FSMRelation *) hash_search(FreeSpaceMap->relHash, + result = (FSMRelation *) hash_search(FreeSpaceMapRelHash, (void *) &(fsmrel->key), HASH_REMOVE, NULL); |