diff options
| author | Bruce Momjian <bruce@momjian.us> | 1998-01-28 06:52:58 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 1998-01-28 06:52:58 +0000 |
| commit | 0ff43badd540f376cebbde641ab1f805a98f6200 (patch) | |
| tree | dd628605e5fd444c090d8acbd787c8d342908fd0 | |
| parent | 8a02b22e89dacb292f4737e97d90c1a2c748b8b5 (diff) | |
| download | postgresql-0ff43badd540f376cebbde641ab1f805a98f6200.tar.gz postgresql-0ff43badd540f376cebbde641ab1f805a98f6200.zip | |
Lock cleanup
| -rw-r--r-- | src/backend/storage/lmgr/lock.c | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/src/backend/storage/lmgr/lock.c b/src/backend/storage/lmgr/lock.c index e218a403425..7a444a15fab 100644 --- a/src/backend/storage/lmgr/lock.c +++ b/src/backend/storage/lmgr/lock.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.24 1998/01/28 02:29:27 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.25 1998/01/28 06:52:58 momjian Exp $ * * NOTES * Outside modules can create a lock table and acquire/release @@ -1456,13 +1456,14 @@ DeadLockCheck(SHM_QUEUE *lockQueue, LOCK *findlock, bool skip_check) item.tag.pid = pid; #endif - if ((result = (XIDLookupEnt *) - hash_search(xidTable, (Pointer) &item, HASH_FIND, &found)) && found) - MyNHolding = result->nHolding; - else - MyNHolding = 0; - } - + if (!(result = (XIDLookupEnt *) + hash_search(xidTable, (Pointer) &item, HASH_FIND, &found)) || !found) + { + elog(NOTICE, "LockAcquire: xid table corrupted"); + return true; + } + MyNHolding = result->nHolding; + } if (SHMQueueEmpty(lockQueue)) return false; @@ -1533,12 +1534,14 @@ DeadLockCheck(SHM_QUEUE *lockQueue, LOCK *findlock, bool skip_check) item.tag.pid = pid; #endif - if ((result = (XIDLookupEnt *) - hash_search(xidTable, (Pointer) &item, HASH_FIND, &found)) && found) + if (!(result = (XIDLookupEnt *) + hash_search(xidTable, (Pointer) &item, HASH_FIND, &found)) || !found) { - if (result->nHolding) - return true; + elog(NOTICE, "LockAcquire: xid table corrupted"); + return true; } + if (result->nHolding) + return true; } /* * No sense in looking at the wait queue of the lock we are |