mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename Lockm to Locks.

Browse Source
This commit is contained in:
Bruce Momjian 1998-06-26 19:57:50 +00:00
parent ae6a658584
commit 8fa93b016a
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipci.c,v 1.12 1998/06/25 14:24:34 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipci.c,v 1.13 1998/06/26 19:57:48 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -92,8 +92,8 @@ CreateSharedMemoryAndSemaphores(IPCKey key)
* ---------------- * ----------------
*/ */
InitLocks(); InitLocks();
InitMultiLevelLockm(); InitMultiLevelLocks();
if (InitMultiLevelLockm() == INVALID_TABLEID) if (InitMultiLevelLocks() == INVALID_TABLEID)
elog(FATAL, "Couldn't create the lock table"); elog(FATAL, "Couldn't create the lock table");
/* ---------------- /* ----------------
@ -146,7 +146,7 @@ AttachSharedMemoryAndSemaphores(IPCKey key)
* ---------------- * ----------------
*/ */
InitLocks(); InitLocks();
if (InitMultiLevelLockm() == INVALID_TABLEID) if (InitMultiLevelLocks() == INVALID_TABLEID)
elog(FATAL, "Couldn't attach to the lock table"); elog(FATAL, "Couldn't attach to the lock table");
AttachSharedInvalidationState(key); AttachSharedInvalidationState(key);

8
src/backend/storage/lmgr/multi.c
View File

@ -12,7 +12,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Attic/multi.c,v 1.15 1998/06/26 01:58:45 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Attic/multi.c,v 1.16 1998/06/26 19:57:49 momjian Exp $
* *
* NOTES: * NOTES:
* (1) The lock.c module assumes that the caller here is doing * (1) The lock.c module assumes that the caller here is doing
@ -85,7 +85,7 @@ LockTableId ShortTermTableId = (LockTableId) NULL;
* Create the lock table described by MultiConflicts and Multiprio. * Create the lock table described by MultiConflicts and Multiprio.
*/ */
LockTableId LockTableId
InitMultiLevelLockm() InitMultiLevelLocks()
{ {
int tableId; int tableId;
@ -99,13 +99,13 @@ InitMultiLevelLockm()
tableId = LockTableInit("LockTable", MultiConflicts, MultiPrios, 5); tableId = LockTableInit("LockTable", MultiConflicts, MultiPrios, 5);
MultiTableId = tableId; MultiTableId = tableId;
if (!(MultiTableId)) if (!(MultiTableId))
elog(ERROR, "InitMultiLockm: couldnt initialize lock table"); elog(ERROR, "InitMultiLocks: couldnt initialize lock table");
/* ----------------------- /* -----------------------
* No short term lock table for now. -Jeff 15 July 1991 * No short term lock table for now. -Jeff 15 July 1991
* *
* ShortTermTableId = LockTableRename(tableId); * ShortTermTableId = LockTableRename(tableId);
* if (! (ShortTermTableId)) { * if (! (ShortTermTableId)) {
* elog(ERROR,"InitMultiLockm: couldnt rename lock table"); * elog(ERROR,"InitMultiLocks: couldnt rename lock table");
* } * }
* ----------------------- * -----------------------
*/ */

4
src/include/storage/multilev.h
View File

@ -7,7 +7,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: multilev.h,v 1.7 1998/02/26 04:43:30 momjian Exp $ * $Id: multilev.h,v 1.8 1998/06/26 19:57:50 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -49,7 +49,7 @@ extern LockTableId ShortTermTableId;
/* /*
* function prototypes * function prototypes
*/ */
extern LockTableId InitMultiLevelLockm(void); extern LockTableId InitMultiLevelLocks(void);
extern bool MultiLockReln(LockInfo linfo, LOCKT lockt); extern bool MultiLockReln(LockInfo linfo, LOCKT lockt);
extern bool MultiLockTuple(LockInfo linfo, ItemPointer tidPtr, LOCKT lockt); extern bool MultiLockTuple(LockInfo linfo, ItemPointer tidPtr, LOCKT lockt);
extern bool MultiLockPage(LockInfo linfo, ItemPointer tidPtr, LOCKT lockt); extern bool MultiLockPage(LockInfo linfo, ItemPointer tidPtr, LOCKT lockt);