diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2004-08-27 17:07:42 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2004-08-27 17:07:42 +0000 |
| commit | 1785acebf2ed14fd66955e2d9a55d77a025f418d (patch) | |
| tree | 0c2c3ebe3c71cebd822549fd07fcad38b0985326 /src/backend/utils/adt/lockfuncs.c | |
| parent | ef16b4e1574799b6e2aa6549a6eda5e4867675ec (diff) | |
| download | postgresql-1785acebf2ed14fd66955e2d9a55d77a025f418d.tar.gz postgresql-1785acebf2ed14fd66955e2d9a55d77a025f418d.zip | |
Introduce local hash table for lock state, as per recent proposal.
PROCLOCK structs in shared memory now have only a bitmask for held
locks, rather than counts (making them 40 bytes smaller, which is a
good thing). Multiple locks within a transaction are counted in the
local hash table instead, and we have provision for tracking which
ResourceOwner each count belongs to. Solves recently reported problem
with memory leakage within long transactions.
Diffstat (limited to 'src/backend/utils/adt/lockfuncs.c')
| -rw-r--r-- | src/backend/utils/adt/lockfuncs.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/src/backend/utils/adt/lockfuncs.c b/src/backend/utils/adt/lockfuncs.c index bc4901aa546..5afa1a551a3 100644 --- a/src/backend/utils/adt/lockfuncs.c +++ b/src/backend/utils/adt/lockfuncs.c @@ -6,7 +6,7 @@ * Copyright (c) 2002-2003, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/lockfuncs.c,v 1.13 2004/04/01 21:28:45 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/lockfuncs.c,v 1.14 2004/08/27 17:07:41 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -92,7 +92,7 @@ pg_lock_status(PG_FUNCTION_ARGS) LOCK *lock; PGPROC *proc; bool granted; - LOCKMODE mode; + LOCKMODE mode = 0; Datum values[6]; char nulls[6]; HeapTuple tuple; @@ -108,13 +108,16 @@ pg_lock_status(PG_FUNCTION_ARGS) * report again. */ granted = false; - for (mode = 0; mode < MAX_LOCKMODES; mode++) + if (proclock->holdMask) { - if (proclock->holding[mode] > 0) + for (mode = 0; mode < MAX_LOCKMODES; mode++) { - granted = true; - proclock->holding[mode] = 0; - break; + if (proclock->holdMask & LOCKBIT_ON(mode)) + { + granted = true; + proclock->holdMask &= LOCKBIT_OFF(mode); + break; + } } } |