|
7 | 7 | * |
8 | 8 | * |
9 | 9 | * IDENTIFICATION |
10 | | - * $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmem.c,v 1.21 1998/06/23 16:04:46 momjian Exp $ |
| 10 | + * $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmem.c,v 1.22 1998/06/25 14:24:34 momjian Exp $ |
11 | 11 | * |
12 | 12 | *------------------------------------------------------------------------- |
13 | 13 | */ |
@@ -81,21 +81,21 @@ SPINLOCKBindingLock;/* lock for binding table access */ |
81 | 81 | staticunsigned long*ShmemFreeStart=NULL;/* pointer to the OFFSET |
82 | 82 | * of first free shared |
83 | 83 | * memory */ |
84 | | -staticunsigned long*ShmemBindingTabOffset=NULL;/* start of the binding |
| 84 | +staticunsigned long*ShmemBindingTableOffset=NULL;/* start of the binding |
85 | 85 | * table (for bootstrap) */ |
86 | 86 | staticintShmemBootstrap= FALSE;/* flag becomes true when shared |
87 | 87 | * mem is created by POSTMASTER */ |
88 | 88 |
|
89 | 89 | staticHTAB*BindingTable=NULL; |
90 | 90 |
|
91 | 91 | /* --------------------- |
92 | | - *ShmemBindingTabReset() - Resets the binding table to NULL.... |
| 92 | + *ShmemBindingTableReset() - Resets the binding table to NULL.... |
93 | 93 | * useful when the postmaster destroys existing shared memory |
94 | 94 | * and creates all new segments after a backend crash. |
95 | 95 | * ---------------------- |
96 | 96 | */ |
97 | 97 | void |
98 | | -ShmemBindingTabReset(void) |
| 98 | +ShmemBindingTableReset(void) |
99 | 99 | { |
100 | 100 | BindingTable= (HTAB*)NULL; |
101 | 101 | } |
@@ -179,10 +179,10 @@ InitShmem(unsigned int key, unsigned int size) |
179 | 179 | /* First long in shared memory is the count of available space */ |
180 | 180 | ShmemFreeStart= (unsigned long*)ShmemBase; |
181 | 181 | /* next is a shmem pointer to the binding table */ |
182 | | -ShmemBindingTabOffset=ShmemFreeStart+1; |
| 182 | +ShmemBindingTableOffset=ShmemFreeStart+1; |
183 | 183 |
|
184 | 184 | currFreeSpace+= |
185 | | -sizeof(ShmemFreeStart)+sizeof(ShmemBindingTabOffset); |
| 185 | +sizeof(ShmemFreeStart)+sizeof(ShmemBindingTableOffset); |
186 | 186 |
|
187 | 187 | /* |
188 | 188 | * bootstrap initialize spin locks so we can start to use the |
@@ -245,7 +245,7 @@ InitShmem(unsigned int key, unsigned int size) |
245 | 245 |
|
246 | 246 | Assert(ShmemBootstrap); |
247 | 247 | result->location=MAKE_OFFSET(BindingTable->hctl); |
248 | | -*ShmemBindingTabOffset=result->location; |
| 248 | +*ShmemBindingTableOffset=result->location; |
249 | 249 | result->size=BTABLE_SIZE; |
250 | 250 |
|
251 | 251 | ShmemBootstrap= FALSE; |
@@ -514,10 +514,10 @@ ShmemInitStruct(char *name, unsigned long size, bool *foundPtr) |
514 | 514 | } |
515 | 515 | else |
516 | 516 | { |
517 | | -Assert(ShmemBindingTabOffset); |
| 517 | +Assert(ShmemBindingTableOffset); |
518 | 518 |
|
519 | 519 | *foundPtr= TRUE; |
520 | | -return ((long*)MAKE_PTR(*ShmemBindingTabOffset)); |
| 520 | +return ((long*)MAKE_PTR(*ShmemBindingTableOffset)); |
521 | 521 | } |
522 | 522 |
|
523 | 523 |
|
|