Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 105d4c5

Browse files
robertmhaasrobertmhaas
committed
Fix assorted dtrace breakage caused by patch to include backend IDs
in temp relpaths. Per buildfarm.
1 parent 36ba263 commit 105d4c5

File tree

2 files changed

+27
-25
lines changed

2 files changed

+27
-25
lines changed

‎src/backend/storage/buffer/bufmgr.c

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/storage/buffer/bufmgr.c,v 1.257 2010/08/13 20:10:52 rhaas Exp $
11+
* $PostgreSQL: pgsql/src/backend/storage/buffer/bufmgr.c,v 1.258 2010/08/13 22:54:17 rhaas Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -295,10 +295,10 @@ ReadBuffer_common(SMgrRelation smgr, bool isLocalBuf, ForkNumber forkNum,
295295
isExtend = (blockNum == P_NEW);
296296

297297
TRACE_POSTGRESQL_BUFFER_READ_START(forkNum, blockNum,
298-
smgr->smgr_rnode.spcNode,
299-
smgr->smgr_rnode.dbNode,
300-
smgr->smgr_rnode.relNode,
301-
isLocalBuf,
298+
smgr->smgr_rnode.node.spcNode,
299+
smgr->smgr_rnode.node.dbNode,
300+
smgr->smgr_rnode.node.relNode,
301+
smgr->smgr_rnode.backend,
302302
isExtend);
303303

304304
/* Substitute proper block number if caller asked for P_NEW */
@@ -340,10 +340,10 @@ ReadBuffer_common(SMgrRelation smgr, bool isLocalBuf, ForkNumber forkNum,
340340
VacuumCostBalance += VacuumCostPageHit;
341341

342342
TRACE_POSTGRESQL_BUFFER_READ_DONE(forkNum, blockNum,
343-
smgr->smgr_rnode.spcNode,
344-
smgr->smgr_rnode.dbNode,
345-
smgr->smgr_rnode.relNode,
346-
isLocalBuf,
343+
smgr->smgr_rnode.node.spcNode,
344+
smgr->smgr_rnode.node.dbNode,
345+
smgr->smgr_rnode.node.relNode,
346+
smgr->smgr_rnode.backend,
347347
isExtend,
348348
found);
349349

@@ -640,17 +640,17 @@ BufferAlloc(SMgrRelation smgr, ForkNumber forkNum,
640640

641641
/* OK, do the I/O */
642642
TRACE_POSTGRESQL_BUFFER_WRITE_DIRTY_START(forkNum, blockNum,
643-
smgr->smgr_rnode.spcNode,
644-
smgr->smgr_rnode.dbNode,
645-
smgr->smgr_rnode.relNode);
643+
smgr->smgr_rnode.node.spcNode,
644+
smgr->smgr_rnode.node.dbNode,
645+
smgr->smgr_rnode.node.relNode);
646646

647647
FlushBuffer(buf, NULL);
648648
LWLockRelease(buf->content_lock);
649649

650650
TRACE_POSTGRESQL_BUFFER_WRITE_DIRTY_DONE(forkNum, blockNum,
651-
smgr->smgr_rnode.spcNode,
652-
smgr->smgr_rnode.dbNode,
653-
smgr->smgr_rnode.relNode);
651+
smgr->smgr_rnode.node.spcNode,
652+
smgr->smgr_rnode.node.dbNode,
653+
smgr->smgr_rnode.node.relNode);
654654
}
655655
else
656656
{
@@ -1850,9 +1850,10 @@ FlushBuffer(volatile BufferDesc *buf, SMgrRelation reln)
18501850

18511851
TRACE_POSTGRESQL_BUFFER_FLUSH_START(buf->tag.forkNum,
18521852
buf->tag.blockNum,
1853-
reln->smgr_rnode.spcNode,
1854-
reln->smgr_rnode.dbNode,
1855-
reln->smgr_rnode.relNode);
1853+
reln->smgr_rnode.node.spcNode,
1854+
reln->smgr_rnode.node.dbNode,
1855+
reln->smgr_rnode.node.relNode,
1856+
reln->smgr_rnode.backend);
18561857

18571858
/*
18581859
* Force XLOG flush up to buffer's LSN. This implements the basic WAL
@@ -1889,9 +1890,10 @@ FlushBuffer(volatile BufferDesc *buf, SMgrRelation reln)
18891890

18901891
TRACE_POSTGRESQL_BUFFER_FLUSH_DONE(buf->tag.forkNum,
18911892
buf->tag.blockNum,
1892-
reln->smgr_rnode.spcNode,
1893-
reln->smgr_rnode.dbNode,
1894-
reln->smgr_rnode.relNode);
1893+
reln->smgr_rnode.node.spcNode,
1894+
reln->smgr_rnode.node.dbNode,
1895+
reln->smgr_rnode.node.relNode,
1896+
reln->smgr_rnode.backend);
18951897

18961898
/* Pop the error context stack */
18971899
error_context_stack = errcontext.previous;

‎src/backend/utils/probes.d

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* Copyright (c) 2006-2010, PostgreSQL Global Development Group
55
*
6-
* $PostgreSQL: pgsql/src/backend/utils/probes.d,v 1.13 2010/08/13 20:10:52 rhaas Exp $
6+
* $PostgreSQL: pgsql/src/backend/utils/probes.d,v 1.14 2010/08/13 22:54:17 rhaas Exp $
77
* ----------
88
*/
99

@@ -54,10 +54,10 @@ provider postgresql {
5454
probe sort__start(int, bool, int, int, bool);
5555
probe sort__done(bool, long);
5656

57-
probe buffer__read__start(ForkNumber, BlockNumber, Oid, Oid, Oid, bool, bool);
57+
probe buffer__read__start(ForkNumber, BlockNumber, Oid, Oid, Oid, int, bool);
5858
probe buffer__read__done(ForkNumber, BlockNumber, Oid, Oid, Oid, int, bool, bool);
59-
probe buffer__flush__start(ForkNumber, BlockNumber, Oid, Oid, Oid);
60-
probe buffer__flush__done(ForkNumber, BlockNumber, Oid, Oid, Oid);
59+
probe buffer__flush__start(ForkNumber, BlockNumber, Oid, Oid, Oid, int);
60+
probe buffer__flush__done(ForkNumber, BlockNumber, Oid, Oid, Oid, int);
6161

6262
probe buffer__checkpoint__start(int);
6363
probe buffer__checkpoint__sync__start();

0 commit comments

Comments
 (0)