rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't use 'private' as a parameter name in visible headers ... makes C++ 

very unhappy ...
This commit is contained in:
Tom Lane 2000-12-03 17:18:10 +00:00
parent e7c80220d3
commit 68ed296301
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/backend/storage/ipc/ipc.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.55 2000/11/30 03:11:24 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.56 2000/12/03 17:18:10 tgl Exp $
* *
* NOTES * NOTES
* *
@ -663,7 +663,7 @@ IpcInitKeyAssignment(int port)
* but we do not fail upon collision with non-Postgres shmem segments. * but we do not fail upon collision with non-Postgres shmem segments.
*/ */
PGShmemHeader * PGShmemHeader *
IpcMemoryCreate(uint32 size, bool private, int permission) IpcMemoryCreate(uint32 size, bool makePrivate, int permission)
{ {
void *memAddress; void *memAddress;
PGShmemHeader *hdr; PGShmemHeader *hdr;
@ -677,7 +677,7 @@ IpcMemoryCreate(uint32 size, bool private, int permission)
IpcMemoryId shmid; IpcMemoryId shmid;
/* Special case if creating a private segment --- just malloc() it */ /* Special case if creating a private segment --- just malloc() it */
if (private) if (makePrivate)
{ {
memAddress = PrivateMemoryCreate(size); memAddress = PrivateMemoryCreate(size);
break; break;

8
src/backend/storage/ipc/ipci.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipci.c,v 1.36 2000/11/30 01:39:07 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipci.c,v 1.37 2000/12/03 17:18:10 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -33,11 +33,11 @@
* It is NEVER called by a backend forked from the postmaster; * It is NEVER called by a backend forked from the postmaster;
* for such a backend, the shared memory is already ready-to-go. * for such a backend, the shared memory is already ready-to-go.
* *
* If "private" is true then we only need private memory, not shared * If "makePrivate" is true then we only need private memory, not shared
* memory. This is true for a standalone backend, false for a postmaster. * memory. This is true for a standalone backend, false for a postmaster.
*/ */
void void
CreateSharedMemoryAndSemaphores(bool private, int maxBackends) CreateSharedMemoryAndSemaphores(bool makePrivate, int maxBackends)
{ {
int size; int size;
PGShmemHeader *seghdr; PGShmemHeader *seghdr;
@ -62,7 +62,7 @@ CreateSharedMemoryAndSemaphores(bool private, int maxBackends)
/* /*
* Create the shmem segment * Create the shmem segment
*/ */
seghdr = IpcMemoryCreate(size, private, IPCProtection); seghdr = IpcMemoryCreate(size, makePrivate, IPCProtection);
/* /*
* First initialize spinlocks --- needed by InitShmemAllocation() * First initialize spinlocks --- needed by InitShmemAllocation()

7
src/include/storage/ipc.h
View File

@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $Id: ipc.h,v 1.43 2000/11/28 23:27:57 tgl Exp $ * $Id: ipc.h,v 1.44 2000/12/03 17:18:09 tgl Exp $
* *
* Some files that would normally need to include only sys/ipc.h must * Some files that would normally need to include only sys/ipc.h must
* instead include this file because on Ultrix, sys/ipc.h is not designed * instead include this file because on Ultrix, sys/ipc.h is not designed
@ -104,10 +104,11 @@ extern void IpcSemaphoreUnlock(IpcSemaphoreId semId, int sem);
extern bool IpcSemaphoreTryLock(IpcSemaphoreId semId, int sem); extern bool IpcSemaphoreTryLock(IpcSemaphoreId semId, int sem);
extern int IpcSemaphoreGetValue(IpcSemaphoreId semId, int sem); extern int IpcSemaphoreGetValue(IpcSemaphoreId semId, int sem);
extern PGShmemHeader *IpcMemoryCreate(uint32 size, bool private, extern PGShmemHeader *IpcMemoryCreate(uint32 size, bool makePrivate,
int permission); int permission);
/* ipci.c */ /* ipci.c */
extern void CreateSharedMemoryAndSemaphores(bool private, int maxBackends); extern void CreateSharedMemoryAndSemaphores(bool makePrivate,
int maxBackends);
#endif /* IPC_H */ #endif /* IPC_H */