diff options
Diffstat (limited to 'src/include/storage')
-rw-r--r-- | src/include/storage/backendid.h | 5 | ||||
-rw-r--r-- | src/include/storage/buf_internals.h | 25 | ||||
-rw-r--r-- | src/include/storage/bufmgr.h | 4 | ||||
-rw-r--r-- | src/include/storage/fd.h | 4 | ||||
-rw-r--r-- | src/include/storage/itemptr.h | 5 | ||||
-rw-r--r-- | src/include/storage/lmgr.h | 21 | ||||
-rw-r--r-- | src/include/storage/lock.h | 45 | ||||
-rw-r--r-- | src/include/storage/lwlock.h | 5 | ||||
-rw-r--r-- | src/include/storage/pg_shmem.h | 4 | ||||
-rw-r--r-- | src/include/storage/proc.h | 16 | ||||
-rw-r--r-- | src/include/storage/procarray.h | 4 | ||||
-rw-r--r-- | src/include/storage/sinval.h | 8 | ||||
-rw-r--r-- | src/include/storage/sinvaladt.h | 9 | ||||
-rw-r--r-- | src/include/storage/smgr.h | 4 |
14 files changed, 75 insertions, 84 deletions
diff --git a/src/include/storage/backendid.h b/src/include/storage/backendid.h index dfcdd77dbd6..b329c611043 100644 --- a/src/include/storage/backendid.h +++ b/src/include/storage/backendid.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/storage/backendid.h,v 1.17 2004/12/31 22:03:42 pgsql Exp $ + * $PostgreSQL: pgsql/src/include/storage/backendid.h,v 1.18 2005/10/15 02:49:46 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,8 +18,7 @@ * -cim 8/17/90 * ---------------- */ -typedef int BackendId; /* unique currently active backend - * identifier */ +typedef int BackendId; /* unique currently active backend identifier */ #define InvalidBackendId (-1) diff --git a/src/include/storage/buf_internals.h b/src/include/storage/buf_internals.h index e75f24a6ced..b2cbf3049e6 100644 --- a/src/include/storage/buf_internals.h +++ b/src/include/storage/buf_internals.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/storage/buf_internals.h,v 1.80 2005/10/12 16:45:14 tgl Exp $ + * $PostgreSQL: pgsql/src/include/storage/buf_internals.h,v 1.81 2005/10/15 02:49:46 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -31,13 +31,10 @@ #define BM_DIRTY (1 << 0) /* data needs writing */ #define BM_VALID (1 << 1) /* data is valid */ #define BM_TAG_VALID (1 << 2) /* tag is assigned */ -#define BM_IO_IN_PROGRESS (1 << 3) /* read or write in - * progress */ +#define BM_IO_IN_PROGRESS (1 << 3) /* read or write in progress */ #define BM_IO_ERROR (1 << 4) /* previous I/O failed */ -#define BM_JUST_DIRTIED (1 << 5) /* dirtied since write - * started */ -#define BM_PIN_COUNT_WAITER (1 << 6) /* have waiter for sole - * pin */ +#define BM_JUST_DIRTIED (1 << 5) /* dirtied since write started */ +#define BM_PIN_COUNT_WAITER (1 << 6) /* have waiter for sole pin */ typedef bits16 BufFlags; @@ -94,9 +91,9 @@ typedef struct buftag * * Note: buf_hdr_lock must be held to examine or change the tag, flags, * usage_count, refcount, or wait_backend_pid fields. buf_id field never - * changes after initialization, so does not need locking. freeNext is + * changes after initialization, so does not need locking. freeNext is * protected by the BufFreelistLock not buf_hdr_lock. The LWLocks can take - * care of themselves. The buf_hdr_lock is *not* used to control access to + * care of themselves. The buf_hdr_lock is *not* used to control access to * the data in the buffer! * * An exception is that if we have the buffer pinned, its tag can't change @@ -107,7 +104,7 @@ typedef struct buftag * * We can't physically remove items from a disk page if another backend has * the buffer pinned. Hence, a backend may need to wait for all other pins - * to go away. This is signaled by storing its own PID into + * to go away. This is signaled by storing its own PID into * wait_backend_pid and setting flag bit BM_PIN_COUNT_WAITER. At present, * there can be only one such waiter per buffer. * @@ -120,7 +117,7 @@ typedef struct sbufdesc BufFlags flags; /* see bit definitions above */ uint16 usage_count; /* usage counter for clock sweep code */ unsigned refcount; /* # of backends holding pins on buffer */ - int wait_backend_pid; /* backend PID of pin-count waiter */ + int wait_backend_pid; /* backend PID of pin-count waiter */ slock_t buf_hdr_lock; /* protects the above fields */ @@ -151,13 +148,13 @@ typedef struct sbufdesc * ensure that the compiler doesn't rearrange accesses to the header to * occur before or after the spinlock is acquired/released. */ -#define LockBufHdr(bufHdr) \ +#define LockBufHdr(bufHdr) \ SpinLockAcquire(&(bufHdr)->buf_hdr_lock) #define UnlockBufHdr(bufHdr) \ SpinLockRelease(&(bufHdr)->buf_hdr_lock) #define LockBufHdr_NoHoldoff(bufHdr) \ SpinLockAcquire_NoHoldoff(&(bufHdr)->buf_hdr_lock) -#define UnlockBufHdr_NoHoldoff(bufHdr) \ +#define UnlockBufHdr_NoHoldoff(bufHdr) \ SpinLockRelease_NoHoldoff(&(bufHdr)->buf_hdr_lock) @@ -191,7 +188,7 @@ extern Size StrategyShmemSize(void); extern void StrategyInitialize(bool init); /* buf_table.c */ -extern Size BufTableShmemSize(int size); +extern Size BufTableShmemSize(int size); extern void InitBufTable(int size); extern int BufTableLookup(BufferTag *tagPtr); extern int BufTableInsert(BufferTag *tagPtr, int buf_id); diff --git a/src/include/storage/bufmgr.h b/src/include/storage/bufmgr.h index 63def4a2e29..afe323314ba 100644 --- a/src/include/storage/bufmgr.h +++ b/src/include/storage/bufmgr.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/storage/bufmgr.h,v 1.96 2005/08/20 23:26:33 tgl Exp $ + * $PostgreSQL: pgsql/src/include/storage/bufmgr.h,v 1.97 2005/10/15 02:49:46 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -153,7 +153,7 @@ extern void LockBufferForCleanup(Buffer buffer); extern void AbortBufferIO(void); extern void BufmgrCommit(void); -extern void BufferSync(void); +extern void BufferSync(void); extern void BgBufferSync(void); extern void AtProcExit_LocalBuffers(void); diff --git a/src/include/storage/fd.h b/src/include/storage/fd.h index 5a25e518794..5b1ebe743ba 100644 --- a/src/include/storage/fd.h +++ b/src/include/storage/fd.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/storage/fd.h,v 1.53 2005/08/08 03:12:16 tgl Exp $ + * $PostgreSQL: pgsql/src/include/storage/fd.h,v 1.54 2005/10/15 02:49:46 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -88,7 +88,7 @@ extern void set_max_safe_fds(void); extern void closeAllVfds(void); extern void AtEOXact_Files(void); extern void AtEOSubXact_Files(bool isCommit, SubTransactionId mySubid, - SubTransactionId parentSubid); + SubTransactionId parentSubid); extern void RemovePgTempFiles(void); extern int pg_fsync(int fd); extern int pg_fsync_no_writethrough(int fd); diff --git a/src/include/storage/itemptr.h b/src/include/storage/itemptr.h index 75cddd84296..8705644f7bb 100644 --- a/src/include/storage/itemptr.h +++ b/src/include/storage/itemptr.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/storage/itemptr.h,v 1.26 2004/12/31 22:03:42 pgsql Exp $ + * $PostgreSQL: pgsql/src/include/storage/itemptr.h,v 1.27 2005/10/15 02:49:46 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -41,8 +41,7 @@ typedef struct ItemPointerData } #ifdef __arm__ -__attribute__((packed)) /* Appropriate whack upside the head for - * ARM */ +__attribute__((packed)) /* Appropriate whack upside the head for ARM */ #endif ItemPointerData; diff --git a/src/include/storage/lmgr.h b/src/include/storage/lmgr.h index 72504ee2ab5..730060a3480 100644 --- a/src/include/storage/lmgr.h +++ b/src/include/storage/lmgr.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/storage/lmgr.h,v 1.51 2005/08/01 20:31:16 tgl Exp $ + * $PostgreSQL: pgsql/src/include/storage/lmgr.h,v 1.52 2005/10/15 02:49:46 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -28,13 +28,12 @@ #define RowExclusiveLock 3 /* INSERT, UPDATE, DELETE */ #define ShareUpdateExclusiveLock 4 /* VACUUM (non-FULL) */ #define ShareLock 5 /* CREATE INDEX */ -#define ShareRowExclusiveLock 6 /* like EXCLUSIVE MODE, but allows - * ROW SHARE */ +#define ShareRowExclusiveLock 6 /* like EXCLUSIVE MODE, but allows ROW + * SHARE */ #define ExclusiveLock 7 /* blocks ROW SHARE/SELECT...FOR * UPDATE */ #define AccessExclusiveLock 8 /* ALTER TABLE, DROP TABLE, VACUUM - * FULL, and unqualified LOCK - * TABLE */ + * FULL, and unqualified LOCK TABLE */ /* * Note: all lock mode numbers must be less than lock.h's MAX_LOCKMODES, @@ -50,7 +49,7 @@ extern bool ConditionalLockRelation(Relation relation, LOCKMODE lockmode); extern void UnlockRelation(Relation relation, LOCKMODE lockmode); extern void LockRelationForSession(LockRelId *relid, bool istemprel, - LOCKMODE lockmode); + LOCKMODE lockmode); extern void UnlockRelationForSession(LockRelId *relid, LOCKMODE lockmode); /* Lock a relation for extension */ @@ -65,7 +64,7 @@ extern void UnlockPage(Relation relation, BlockNumber blkno, LOCKMODE lockmode); /* Lock a tuple (see heap_lock_tuple before assuming you understand this) */ extern void LockTuple(Relation relation, ItemPointer tid, LOCKMODE lockmode); extern bool ConditionalLockTuple(Relation relation, ItemPointer tid, - LOCKMODE lockmode); + LOCKMODE lockmode); extern void UnlockTuple(Relation relation, ItemPointer tid, LOCKMODE lockmode); /* Lock an XID (used to wait for a transaction to finish) */ @@ -76,14 +75,14 @@ extern bool ConditionalXactLockTableWait(TransactionId xid); /* Lock a general object (other than a relation) of the current database */ extern void LockDatabaseObject(Oid classid, Oid objid, uint16 objsubid, - LOCKMODE lockmode); + LOCKMODE lockmode); extern void UnlockDatabaseObject(Oid classid, Oid objid, uint16 objsubid, - LOCKMODE lockmode); + LOCKMODE lockmode); /* Lock a shared-across-databases object (other than a relation) */ extern void LockSharedObject(Oid classid, Oid objid, uint16 objsubid, - LOCKMODE lockmode); + LOCKMODE lockmode); extern void UnlockSharedObject(Oid classid, Oid objid, uint16 objsubid, - LOCKMODE lockmode); + LOCKMODE lockmode); #endif /* LMGR_H */ diff --git a/src/include/storage/lock.h b/src/include/storage/lock.h index 6610b1381b7..e6b9e94b657 100644 --- a/src/include/storage/lock.h +++ b/src/include/storage/lock.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/storage/lock.h,v 1.90 2005/08/20 23:26:33 tgl Exp $ + * $PostgreSQL: pgsql/src/include/storage/lock.h,v 1.91 2005/10/15 02:49:46 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -122,6 +122,7 @@ typedef enum LockTagType /* ID info for a transaction is its TransactionId */ LOCKTAG_OBJECT, /* non-relation database object */ /* ID info for an object is DB OID + CLASS OID + OBJECT OID + SUBID */ + /* * Note: object ID has same representation as in pg_depend and * pg_description, but notice that we are constraining SUBID to 16 bits. @@ -137,23 +138,23 @@ typedef enum LockTagType * to widen Oid, BlockNumber, or TransactionId to more than 32 bits. * * We include lockmethodid in the locktag so that a single hash table in - * shared memory can store locks of different lockmethods. For largely + * shared memory can store locks of different lockmethods. For largely * historical reasons, it's passed to the lock.c routines as a separate * argument and then stored into the locktag. */ typedef struct LOCKTAG { - uint32 locktag_field1; /* a 32-bit ID field */ - uint32 locktag_field2; /* a 32-bit ID field */ - uint32 locktag_field3; /* a 32-bit ID field */ - uint16 locktag_field4; /* a 16-bit ID field */ - uint8 locktag_type; /* see enum LockTagType */ + uint32 locktag_field1; /* a 32-bit ID field */ + uint32 locktag_field2; /* a 32-bit ID field */ + uint32 locktag_field3; /* a 32-bit ID field */ + uint16 locktag_field4; /* a 16-bit ID field */ + uint8 locktag_type; /* see enum LockTagType */ uint8 locktag_lockmethodid; /* lockmethod indicator */ } LOCKTAG; /* * These macros define how we map logical IDs of lockable objects into - * the physical fields of LOCKTAG. Use these to set up LOCKTAG values, + * the physical fields of LOCKTAG. Use these to set up LOCKTAG values, * rather than accessing the fields directly. Note multiple eval of target! */ #define SET_LOCKTAG_RELATION(locktag,dboid,reloid) \ @@ -225,11 +226,9 @@ typedef struct LOCK /* data */ LOCKMASK grantMask; /* bitmask for lock types already granted */ LOCKMASK waitMask; /* bitmask for lock types awaited */ - SHM_QUEUE procLocks; /* list of PROCLOCK objects assoc. with - * lock */ + SHM_QUEUE procLocks; /* list of PROCLOCK objects assoc. with lock */ PROC_QUEUE waitProcs; /* list of PGPROC objects waiting on lock */ - int requested[MAX_LOCKMODES]; /* counts of requested - * locks */ + int requested[MAX_LOCKMODES]; /* counts of requested locks */ int nRequested; /* total of requested[] array */ int granted[MAX_LOCKMODES]; /* counts of granted locks */ int nGranted; /* total of granted[] array */ @@ -250,7 +249,7 @@ typedef struct LOCK * * Internally to a backend, it is possible for the same lock to be held * for different purposes: the backend tracks transaction locks separately - * from session locks. However, this is not reflected in the shared-memory + * from session locks. However, this is not reflected in the shared-memory * state: we only track which backend(s) hold the lock. This is OK since a * backend can never block itself. * @@ -261,7 +260,7 @@ typedef struct LOCK * as soon as convenient. * * releaseMask is workspace for LockReleaseAll(): it shows the locks due - * to be released during the current call. This must only be examined or + * to be released during the current call. This must only be examined or * set by the backend owning the PROCLOCK. * * Each PROCLOCK object is linked into lists for both the associated LOCK @@ -373,13 +372,13 @@ extern LOCKMETHODID LockMethodTableInit(const char *tabName, int numModes); extern LOCKMETHODID LockMethodTableRename(LOCKMETHODID lockmethodid); extern LockAcquireResult LockAcquire(LOCKMETHODID lockmethodid, - LOCKTAG *locktag, - bool isTempObject, - LOCKMODE lockmode, - bool sessionLock, - bool dontWait); + LOCKTAG *locktag, + bool isTempObject, + LOCKMODE lockmode, + bool sessionLock, + bool dontWait); extern bool LockRelease(LOCKMETHODID lockmethodid, LOCKTAG *locktag, - LOCKMODE lockmode, bool sessionLock); + LOCKMODE lockmode, bool sessionLock); extern void LockReleaseAll(LOCKMETHODID lockmethodid, bool allLocks); extern void LockReleaseCurrentOwner(void); extern void LockReassignCurrentOwner(void); @@ -403,11 +402,11 @@ extern LockData *GetLockStatusData(void); extern const char *GetLockmodeName(LOCKMODE mode); extern void lock_twophase_recover(TransactionId xid, uint16 info, - void *recdata, uint32 len); + void *recdata, uint32 len); extern void lock_twophase_postcommit(TransactionId xid, uint16 info, - void *recdata, uint32 len); + void *recdata, uint32 len); extern void lock_twophase_postabort(TransactionId xid, uint16 info, - void *recdata, uint32 len); + void *recdata, uint32 len); #ifdef LOCK_DEBUG extern void DumpLocks(PGPROC *proc); diff --git a/src/include/storage/lwlock.h b/src/include/storage/lwlock.h index 98d1d40ad53..4291e0b2e74 100644 --- a/src/include/storage/lwlock.h +++ b/src/include/storage/lwlock.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/storage/lwlock.h,v 1.22 2005/08/20 23:26:34 tgl Exp $ + * $PostgreSQL: pgsql/src/include/storage/lwlock.h,v 1.23 2005/10/15 02:49:46 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -47,8 +47,7 @@ typedef enum LWLockId BgWriterCommLock, TwoPhaseStateLock, - NumFixedLWLocks, /* must be last except for - * MaxDynamicLWLock */ + NumFixedLWLocks, /* must be last except for MaxDynamicLWLock */ MaxDynamicLWLock = 1000000000 } LWLockId; diff --git a/src/include/storage/pg_shmem.h b/src/include/storage/pg_shmem.h index c034e19ce4b..4dd91e8540f 100644 --- a/src/include/storage/pg_shmem.h +++ b/src/include/storage/pg_shmem.h @@ -17,7 +17,7 @@ * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/storage/pg_shmem.h,v 1.15 2005/08/20 23:26:34 tgl Exp $ + * $PostgreSQL: pgsql/src/include/storage/pg_shmem.h,v 1.16 2005/10/15 02:49:46 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -46,7 +46,7 @@ extern void PGSharedMemoryReAttach(void); #endif extern PGShmemHeader *PGSharedMemoryCreate(Size size, bool makePrivate, - int port); + int port); extern bool PGSharedMemoryIsInUse(unsigned long id1, unsigned long id2); extern void PGSharedMemoryDetach(void); diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index b915f78035e..4cba391048e 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/storage/proc.h,v 1.83 2005/10/11 20:41:32 tgl Exp $ + * $PostgreSQL: pgsql/src/include/storage/proc.h,v 1.84 2005/10/15 02:49:46 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -65,9 +65,9 @@ struct PGPROC TransactionId xid; /* transaction currently being executed by * this proc */ - TransactionId xmin; /* minimal running XID as it was when we - * were starting our xact: vacuum must not - * remove tuples deleted by xid >= xmin ! */ + TransactionId xmin; /* minimal running XID as it was when we were + * starting our xact: vacuum must not remove + * tuples deleted by xid >= xmin ! */ int pid; /* This backend's process id, or 0 */ Oid databaseId; /* OID of database this backend is using */ @@ -83,11 +83,11 @@ struct PGPROC LOCK *waitLock; /* Lock object we're sleeping on ... */ PROCLOCK *waitProcLock; /* Per-holder info for awaited lock */ LOCKMODE waitLockMode; /* type of lock we're waiting for */ - LOCKMASK heldLocks; /* bitmask for lock types already held on - * this lock object by this backend */ + LOCKMASK heldLocks; /* bitmask for lock types already held on this + * lock object by this backend */ - SHM_QUEUE procLocks; /* list of PROCLOCK objects for locks held - * or awaited by this backend */ + SHM_QUEUE procLocks; /* list of PROCLOCK objects for locks held or + * awaited by this backend */ struct XidCache subxids; /* cache for subtransaction XIDs */ }; diff --git a/src/include/storage/procarray.h b/src/include/storage/procarray.h index 1c010ff5b00..68c615afc6e 100644 --- a/src/include/storage/procarray.h +++ b/src/include/storage/procarray.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/storage/procarray.h,v 1.5 2005/08/20 23:26:34 tgl Exp $ + * $PostgreSQL: pgsql/src/include/storage/procarray.h,v 1.6 2005/10/15 02:49:46 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -27,7 +27,7 @@ extern bool TransactionIdIsActive(TransactionId xid); extern TransactionId GetOldestXmin(bool allDbs); extern PGPROC *BackendPidGetProc(int pid); -extern int BackendXidGetPid(TransactionId xid); +extern int BackendXidGetPid(TransactionId xid); extern bool IsBackendPid(int pid); extern bool DatabaseHasActiveBackends(Oid databaseId, bool ignoreMyself); diff --git a/src/include/storage/sinval.h b/src/include/storage/sinval.h index 2fe0cce8366..b4845f8a898 100644 --- a/src/include/storage/sinval.h +++ b/src/include/storage/sinval.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/storage/sinval.h,v 1.42 2005/08/20 23:26:35 tgl Exp $ + * $PostgreSQL: pgsql/src/include/storage/sinval.h,v 1.43 2005/10/15 02:49:46 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -23,9 +23,9 @@ * invalidates an entry in a catcache, one that invalidates a relcache entry, * and one that invalidates an smgr cache entry. More types could be added * if needed. The message type is identified by the first "int16" field of - * the message struct. Zero or positive means a catcache inval message (and + * the message struct. Zero or positive means a catcache inval message (and * also serves as the catcache ID field). -1 means a relcache inval message. - * -2 means an smgr inval message. Other negative values are available to + * -2 means an smgr inval message. Other negative values are available to * identify other inval message types. * * Catcache inval events are initially driven by detecting tuple inserts, @@ -89,7 +89,7 @@ extern void InitBackendSharedInvalidationState(void); extern void SendSharedInvalidMessage(SharedInvalidationMessage *msg); extern void ReceiveSharedInvalidMessages( - void (*invalFunction) (SharedInvalidationMessage *msg), + void (*invalFunction) (SharedInvalidationMessage *msg), void (*resetFunction) (void)); /* signal handler for catchup events (SIGUSR1) */ diff --git a/src/include/storage/sinvaladt.h b/src/include/storage/sinvaladt.h index 7d1f5f46855..c02bee016d4 100644 --- a/src/include/storage/sinvaladt.h +++ b/src/include/storage/sinvaladt.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/storage/sinvaladt.h,v 1.39 2005/08/20 23:26:35 tgl Exp $ + * $PostgreSQL: pgsql/src/include/storage/sinvaladt.h,v 1.40 2005/10/15 02:49:46 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -81,8 +81,7 @@ typedef struct SISeg */ int minMsgNum; /* oldest message still needed */ int maxMsgNum; /* next message number to be assigned */ - int lastBackend; /* index of last active procState entry, - * +1 */ + int lastBackend; /* index of last active procState entry, +1 */ int maxBackends; /* size of procState array */ int freeBackends; /* number of empty procState slots */ @@ -94,8 +93,8 @@ typedef struct SISeg /* * Per-backend state info. * - * We declare procState as 1 entry because C wants a fixed-size array, - * but actually it is maxBackends entries long. + * We declare procState as 1 entry because C wants a fixed-size array, but + * actually it is maxBackends entries long. */ ProcState procState[1]; /* reflects the invalidation state */ } SISeg; diff --git a/src/include/storage/smgr.h b/src/include/storage/smgr.h index ab3c39fd1c6..910d49565c4 100644 --- a/src/include/storage/smgr.h +++ b/src/include/storage/smgr.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/storage/smgr.h,v 1.52 2005/06/17 22:32:50 tgl Exp $ + * $PostgreSQL: pgsql/src/include/storage/smgr.h,v 1.53 2005/10/15 02:49:46 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -30,7 +30,7 @@ * * An SMgrRelation may have an "owner", which is just a pointer to it from * somewhere else; smgr.c will clear this pointer if the SMgrRelation is - * closed. We use this to avoid dangling pointers from relcache to smgr + * closed. We use this to avoid dangling pointers from relcache to smgr * without having to make the smgr explicitly aware of relcache. There * can't be more than one "owner" pointer per SMgrRelation, but that's * all we need. |