database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-30 11:03:19 +03:00
Code Activity

When we add 'waiting' to the ps_status display, there should be a

Browse Source 
space in front of it.  Improve comments a little.
This commit is contained in:
Tom Lane
2001-03-18 20:13:13 +00:00
parent 934126b518
commit ddc5bc958a
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/backend/storage/lmgr/lock.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.86 2001/03/14 18:24:32 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.87 2001/03/18 20:13:13 tgl Exp $
* *
* NOTES * NOTES
* Outside modules can create a lock table and acquire/release * Outside modules can create a lock table and acquire/release
@ -934,11 +934,11 @@ WaitOnLock(LOCKMETHOD lockmethod, LOCKMODE lockmode,
old_status = pstrdup(get_ps_display()); old_status = pstrdup(get_ps_display());
new_status = (char *) palloc(strlen(old_status) + 10); new_status = (char *) palloc(strlen(old_status) + 10);
strcpy(new_status, old_status); strcpy(new_status, old_status);
strcat(new_status, "waiting"); strcat(new_status, " waiting");
set_ps_display(new_status); set_ps_display(new_status);
/* /*
* NOTE: Think not to put any lock state cleanup after the call to * NOTE: Think not to put any shared-state cleanup after the call to
* ProcSleep, in either the normal or failure path. The lock state * ProcSleep, in either the normal or failure path. The lock state
* must be fully set by the lock grantor, or by HandleDeadLock if we * must be fully set by the lock grantor, or by HandleDeadLock if we
* give up waiting for the lock. This is necessary because of the * give up waiting for the lock. This is necessary because of the
@ -946,7 +946,9 @@ WaitOnLock(LOCKMETHOD lockmethod, LOCKMODE lockmode,
* after someone else grants us the lock, but before we've noticed it. * after someone else grants us the lock, but before we've noticed it.
* Hence, after granting, the locktable state must fully reflect the * Hence, after granting, the locktable state must fully reflect the
* fact that we own the lock; we can't do additional work on return. * fact that we own the lock; we can't do additional work on return.
* * Contrariwise, if we fail, any cleanup must happen in xact abort
* processing, not here, to ensure it will also happen in the cancel/die
* case.
*/ */
if (ProcSleep(lockMethodTable, if (ProcSleep(lockMethodTable,
@ -958,7 +960,6 @@ WaitOnLock(LOCKMETHOD lockmethod, LOCKMODE lockmode,
* We failed as a result of a deadlock, see HandleDeadLock(). * We failed as a result of a deadlock, see HandleDeadLock().
* Quit now. Removal of the holder and lock objects, if no longer * Quit now. Removal of the holder and lock objects, if no longer
* needed, will happen in xact cleanup (see above for motivation). * needed, will happen in xact cleanup (see above for motivation).
*
*/ */
LOCK_PRINT("WaitOnLock: aborting on lock", lock, lockmode); LOCK_PRINT("WaitOnLock: aborting on lock", lock, lockmode);
SpinRelease(lockMethodTable->ctl->masterLock); SpinRelease(lockMethodTable->ctl->masterLock);