diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2004-05-28 05:13:32 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2004-05-28 05:13:32 +0000 |
| commit | 1a321f26d88e5c64bccba9d36920aede1e201729 (patch) | |
| tree | 43940a3ed5cc754bff68748502550731b0ad19a0 /src/include/storage/lock.h | |
| parent | 37da0ba0e0f2d92857dc62789820d21e177dc00f (diff) | |
| download | postgresql-1a321f26d88e5c64bccba9d36920aede1e201729.tar.gz | |
Code review for EXEC_BACKEND changes. Reduce the number of #ifdefs by
about a third, make it work on non-Windows platforms again. (But perhaps
I broke the WIN32 code, since I have no way to test that.) Fold all the
paths that fork postmaster child processes to go through the single
routine SubPostmasterMain, which takes care of resurrecting the state that
would normally be inherited from the postmaster (including GUC variables).
Clean up some places where there's no particularly good reason for the
EXEC and non-EXEC cases to work differently. Take care of one or two
FIXMEs that remained in the code.
Diffstat (limited to 'src/include/storage/lock.h')
| -rw-r--r-- | src/include/storage/lock.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/include/storage/lock.h b/src/include/storage/lock.h index 2d13e9df11..8c7159c0cb 100644 --- a/src/include/storage/lock.h +++ b/src/include/storage/lock.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/storage/lock.h,v 1.76 2003/12/20 17:31:21 momjian Exp $ + * $PostgreSQL: pgsql/src/include/storage/lock.h,v 1.77 2004/05/28 05:13:29 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -223,13 +223,16 @@ typedef struct LOCK *locks; } LockData; +extern int NumLockMethods; + /* * function prototypes */ extern void InitLocks(void); extern LockMethod GetLocksMethodTable(LOCK *lock); -extern LOCKMETHODID LockMethodTableInit(char *tabName, LOCKMASK *conflictsP, - int numModes, int maxBackends); +extern LOCKMETHODID LockMethodTableInit(const char *tabName, + const LOCKMASK *conflictsP, + int numModes, int maxBackends); extern LOCKMETHODID LockMethodTableRename(LOCKMETHODID lockmethodid); extern bool LockAcquire(LOCKMETHODID lockmethodid, LOCKTAG *locktag, TransactionId xid, LOCKMODE lockmode, bool dontWait); |