diff options
Diffstat (limited to 'src/backend/storage')
| -rw-r--r-- | src/backend/storage/buffer/bufmgr.c | 16 | ||||
| -rw-r--r-- | src/backend/storage/lmgr/lock.c | 16 |
2 files changed, 14 insertions, 18 deletions
diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index eac98734286..1f6e8d36803 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/storage/buffer/bufmgr.c,v 1.248 2009/03/22 22:39:05 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/storage/buffer/bufmgr.c,v 1.249 2009/03/23 01:52:38 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -272,14 +272,7 @@ ReadBuffer_common(SMgrRelation smgr, bool isLocalBuf, ForkNumber forkNum, ReadLocalBufferCount++; bufHdr = LocalBufferAlloc(smgr, forkNum, blockNum, &found); if (found) - { LocalBufferHitCount++; - TRACE_POSTGRESQL_BUFFER_HIT(true); /* true = local buffer */ - } - else - { - TRACE_POSTGRESQL_BUFFER_MISS(true); /* ditto */ - } } else { @@ -291,14 +284,7 @@ ReadBuffer_common(SMgrRelation smgr, bool isLocalBuf, ForkNumber forkNum, */ bufHdr = BufferAlloc(smgr, forkNum, blockNum, strategy, &found); if (found) - { BufferHitCount++; - TRACE_POSTGRESQL_BUFFER_HIT(false); /* false = shared buffer */ - } - else - { - TRACE_POSTGRESQL_BUFFER_MISS(false); /* ditto */ - } } /* At this point we do NOT hold any locks. */ diff --git a/src/backend/storage/lmgr/lock.c b/src/backend/storage/lmgr/lock.c index 8e927bd5d8f..97c525d17a8 100644 --- a/src/backend/storage/lmgr/lock.c +++ b/src/backend/storage/lmgr/lock.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/storage/lmgr/lock.c,v 1.186 2009/01/01 17:23:47 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/storage/lmgr/lock.c,v 1.187 2009/03/23 01:52:38 tgl Exp $ * * NOTES * A lock table is a shared memory hash table. When @@ -787,11 +787,21 @@ LockAcquire(const LOCKTAG *locktag, * Sleep till someone wakes me up. */ - TRACE_POSTGRESQL_LOCK_WAIT_START(locktag->locktag_field2, lockmode); + TRACE_POSTGRESQL_LOCK_WAIT_START(locktag->locktag_field1, + locktag->locktag_field2, + locktag->locktag_field3, + locktag->locktag_field4, + locktag->locktag_type, + lockmode); WaitOnLock(locallock, owner); - TRACE_POSTGRESQL_LOCK_WAIT_DONE(locktag->locktag_field2, lockmode); + TRACE_POSTGRESQL_LOCK_WAIT_DONE(locktag->locktag_field1, + locktag->locktag_field2, + locktag->locktag_field3, + locktag->locktag_field4, + locktag->locktag_type, + lockmode); /* * NOTE: do not do any material change of state between here and |