NotificationsYou must be signed in to change notification settings
Fork5
Star27

Commit5444f06

Alexander Korotkov

committed

Lockfree Pin/UnpinBuffer ported from 9.6.

1 parentc71dbee commit5444f06Copy full SHA for 5444f06

File tree

12 files changed

+712

-434

lines changed

contrib/pg_buffercache
- pg_buffercache_pages.c
src
- backend/storage
  - buffer
  - lmgr
    - s_lock.c
- include
  - c.h
  - postmaster
    - postmaster.h
  - storage
    - buf_internals.h
    - s_lock.h
  - utils
    - elog.h
- tools/pgindent
  - typedefs.list

12 files changed

+712

-434

lines changed

`‎contrib/pg_buffercache/pg_buffercache_pages.c‎`

Lines changed: 8 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -148,33 +148,34 @@ pg_buffercache_pages(PG_FUNCTION_ARGS)`
`148`	`148`	`*/`
`149`	`149`	`for (i=0;i<NBuffers;i++)`
`150`	`150`	`{`
`151`		`-volatileBufferDesc*bufHdr;`
	`151`	`+BufferDesc*bufHdr;`
	`152`	`+uint32buf_state;`
`152`	`153`
`153`	`154`	`bufHdr=GetBufferDescriptor(i);`
`154`	`155`	`/* Lock each buffer header before inspecting. */`
`155`		`-LockBufHdr(bufHdr);`
	`156`	`+buf_state=LockBufHdr(bufHdr);`
`156`	`157`
`157`	`158`	`fctx->record[i].bufferid=BufferDescriptorGetBuffer(bufHdr);`
`158`	`159`	`fctx->record[i].relfilenode=bufHdr->tag.rnode.relNode;`
`159`	`160`	`fctx->record[i].reltablespace=bufHdr->tag.rnode.spcNode;`
`160`	`161`	`fctx->record[i].reldatabase=bufHdr->tag.rnode.dbNode;`
`161`	`162`	`fctx->record[i].forknum=bufHdr->tag.forkNum;`
`162`	`163`	`fctx->record[i].blocknum=bufHdr->tag.blockNum;`
`163`		`-fctx->record[i].usagecount=bufHdr->usage_count;`
`164`		`-fctx->record[i].pinning_backends=bufHdr->refcount;`
	`164`	`+fctx->record[i].usagecount=BUF_STATE_GET_USAGECOUNT(buf_state);`
	`165`	`+fctx->record[i].pinning_backends=BUF_STATE_GET_REFCOUNT(buf_state);`
`165`	`166`
`166`		`-if (bufHdr->flags&BM_DIRTY)`
	`167`	`+if (buf_state&BM_DIRTY)`
`167`	`168`	`fctx->record[i].isdirty= true;`
`168`	`169`	`else`
`169`	`170`	`fctx->record[i].isdirty= false;`
`170`	`171`
`171`	`172`	`/* Note if the buffer is valid, and has storage created */`
`172`		`-if ((bufHdr->flags&BM_VALID)&& (bufHdr->flags&BM_TAG_VALID))`
	`173`	`+if ((buf_state&BM_VALID)&& (buf_state&BM_TAG_VALID))`
`173`	`174`	`fctx->record[i].isvalid= true;`
`174`	`175`	`else`
`175`	`176`	`fctx->record[i].isvalid= false;`
`176`	`177`
`177`		`-UnlockBufHdr(bufHdr);`
	`178`	`+UnlockBufHdr(bufHdr,buf_state);`
`178`	`179`	`}`
`179`	`180`
`180`	`181`	`/*`

`‎src/backend/storage/buffer/buf_init.c‎`

Lines changed: 2 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -96,12 +96,9 @@ InitBufferPool(void)`
`96`	`96`	`BufferDesc*buf=GetBufferDescriptor(i);`
`97`	`97`
`98`	`98`	`CLEAR_BUFFERTAG(buf->tag);`
`99`		`-buf->flags=0;`
`100`		`-buf->usage_count=0;`
`101`		`-buf->refcount=0;`
`102`		`-buf->wait_backend_pid=0;`
`103`	`99`
`104`		`-SpinLockInit(&buf->buf_hdr_lock);`
	`100`	`+pg_atomic_init_u32(&buf->state,0);`
	`101`	`+buf->wait_backend_pid=0;`
`105`	`102`
`106`	`103`	`buf->buf_id=i;`
`107`	`104`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit5444f06

File tree

12 files changed

12 files changed

`‎contrib/pg_buffercache/pg_buffercache_pages.c‎`

`‎src/backend/storage/buffer/buf_init.c‎`

0 commit comments