open-dsi
/
postgres
mirror of https://github.com/postgres/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix assorted dtrace breakage caused by patch to include backend IDs

Browse Source 
in temp relpaths.

Per buildfarm.
pull/1/head
Robert Haas 15 years ago
parent 36ba263d8f
commit 105d4c5ffe
2 changed files with 27 additions and 25 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 44
      src/backend/storage/buffer/bufmgr.c
  2. 8
      src/backend/utils/probes.d

44
src/backend/storage/buffer/bufmgr.c
Unescape View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/storage/buffer/bufmgr.c,v 1.257 2010/08/13 20:10:52 rhaas Exp $ * $PostgreSQL: pgsql/src/backend/storage/buffer/bufmgr.c,v 1.258 2010/08/13 22:54:17 rhaas Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -295,10 +295,10 @@ ReadBuffer_common(SMgrRelation smgr, bool isLocalBuf, ForkNumber forkNum,
isExtend = (blockNum == P_NEW); isExtend = (blockNum == P_NEW);
TRACE_POSTGRESQL_BUFFER_READ_START(forkNum, blockNum, TRACE_POSTGRESQL_BUFFER_READ_START(forkNum, blockNum,
smgr->smgr_rnode.spcNode, smgr->smgr_rnode.node.spcNode,
smgr->smgr_rnode.dbNode, smgr->smgr_rnode.node.dbNode,
smgr->smgr_rnode.relNode, smgr->smgr_rnode.node.relNode,
isLocalBuf, smgr->smgr_rnode.backend,
isExtend); isExtend);
/* Substitute proper block number if caller asked for P_NEW */ /* Substitute proper block number if caller asked for P_NEW */
@ -340,10 +340,10 @@ ReadBuffer_common(SMgrRelation smgr, bool isLocalBuf, ForkNumber forkNum,
VacuumCostBalance += VacuumCostPageHit; VacuumCostBalance += VacuumCostPageHit;
TRACE_POSTGRESQL_BUFFER_READ_DONE(forkNum, blockNum, TRACE_POSTGRESQL_BUFFER_READ_DONE(forkNum, blockNum,
smgr->smgr_rnode.spcNode, smgr->smgr_rnode.node.spcNode,
smgr->smgr_rnode.dbNode, smgr->smgr_rnode.node.dbNode,
smgr->smgr_rnode.relNode, smgr->smgr_rnode.node.relNode,
isLocalBuf, smgr->smgr_rnode.backend,
isExtend, isExtend,
found); found);
@ -640,17 +640,17 @@ BufferAlloc(SMgrRelation smgr, ForkNumber forkNum,
/* OK, do the I/O */ /* OK, do the I/O */
TRACE_POSTGRESQL_BUFFER_WRITE_DIRTY_START(forkNum, blockNum, TRACE_POSTGRESQL_BUFFER_WRITE_DIRTY_START(forkNum, blockNum,
smgr->smgr_rnode.spcNode, smgr->smgr_rnode.node.spcNode,
smgr->smgr_rnode.dbNode, smgr->smgr_rnode.node.dbNode,
smgr->smgr_rnode.relNode); smgr->smgr_rnode.node.relNode);
FlushBuffer(buf, NULL); FlushBuffer(buf, NULL);
LWLockRelease(buf->content_lock); LWLockRelease(buf->content_lock);
TRACE_POSTGRESQL_BUFFER_WRITE_DIRTY_DONE(forkNum, blockNum, TRACE_POSTGRESQL_BUFFER_WRITE_DIRTY_DONE(forkNum, blockNum,
smgr->smgr_rnode.spcNode, smgr->smgr_rnode.node.spcNode,
smgr->smgr_rnode.dbNode, smgr->smgr_rnode.node.dbNode,
smgr->smgr_rnode.relNode); smgr->smgr_rnode.node.relNode);
} }
else else
{ {
@ -1850,9 +1850,10 @@ FlushBuffer(volatile BufferDesc *buf, SMgrRelation reln)
TRACE_POSTGRESQL_BUFFER_FLUSH_START(buf->tag.forkNum, TRACE_POSTGRESQL_BUFFER_FLUSH_START(buf->tag.forkNum,
buf->tag.blockNum, buf->tag.blockNum,
reln->smgr_rnode.spcNode, reln->smgr_rnode.node.spcNode,
reln->smgr_rnode.dbNode, reln->smgr_rnode.node.dbNode,
reln->smgr_rnode.relNode); reln->smgr_rnode.node.relNode,
reln->smgr_rnode.backend);
/* /*
* Force XLOG flush up to buffer's LSN. This implements the basic WAL * Force XLOG flush up to buffer's LSN. This implements the basic WAL
@ -1889,9 +1890,10 @@ FlushBuffer(volatile BufferDesc *buf, SMgrRelation reln)
TRACE_POSTGRESQL_BUFFER_FLUSH_DONE(buf->tag.forkNum, TRACE_POSTGRESQL_BUFFER_FLUSH_DONE(buf->tag.forkNum,
buf->tag.blockNum, buf->tag.blockNum,
reln->smgr_rnode.spcNode, reln->smgr_rnode.node.spcNode,
reln->smgr_rnode.dbNode, reln->smgr_rnode.node.dbNode,
reln->smgr_rnode.relNode); reln->smgr_rnode.node.relNode,
reln->smgr_rnode.backend);
/* Pop the error context stack */ /* Pop the error context stack */
error_context_stack = errcontext.previous; error_context_stack = errcontext.previous;

8
src/backend/utils/probes.d
Unescape View File

@ -3,7 +3,7 @@
* *
* Copyright (c) 2006-2010, PostgreSQL Global Development Group * Copyright (c) 2006-2010, PostgreSQL Global Development Group
* *
* $PostgreSQL: pgsql/src/backend/utils/probes.d,v 1.13 2010/08/13 20:10:52 rhaas Exp $ * $PostgreSQL: pgsql/src/backend/utils/probes.d,v 1.14 2010/08/13 22:54:17 rhaas Exp $
* ---------- * ----------
*/ */
@ -54,10 +54,10 @@ provider postgresql {
probe sort__start(int, bool, int, int, bool); probe sort__start(int, bool, int, int, bool);
probe sort__done(bool, long); probe sort__done(bool, long);
probe buffer__read__start(ForkNumber, BlockNumber, Oid, Oid, Oid, bool, bool); probe buffer__read__start(ForkNumber, BlockNumber, Oid, Oid, Oid, int, bool);
probe buffer__read__done(ForkNumber, BlockNumber, Oid, Oid, Oid, int, bool, bool); probe buffer__read__done(ForkNumber, BlockNumber, Oid, Oid, Oid, int, bool, bool);
probe buffer__flush__start(ForkNumber, BlockNumber, Oid, Oid, Oid); probe buffer__flush__start(ForkNumber, BlockNumber, Oid, Oid, Oid, int);
probe buffer__flush__done(ForkNumber, BlockNumber, Oid, Oid, Oid); probe buffer__flush__done(ForkNumber, BlockNumber, Oid, Oid, Oid, int);
probe buffer__checkpoint__start(int); probe buffer__checkpoint__start(int);
probe buffer__checkpoint__sync__start(); probe buffer__checkpoint__sync__start();

Write Preview
Loading…
Cancel
Save