NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commit29eedd3

committed

Adjust GetLockConflicts() so that it uses TopMemoryContext when

executed InHotStandby. Cleaner solution than using malloc or pallocdepending upon situation, as proposed by Tom.

1 parent6d2bc0a commit29eedd3Copy full SHA for 29eedd3

File tree

1 file changed

-15

lines changed

src/backend/storage/lmgr
- lock.c

1 file changed

-15

lines changed

`‎src/backend/storage/lmgr/lock.c`

Lines changed: 9 additions & 15 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/storage/lmgr/lock.c,v 1.192 2010/01/28 10:05:37 sriggs Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/storage/lmgr/lock.c,v 1.193 2010/01/29 19:45:12 sriggs Exp $`
`12`	`12`	`*`
`13`	`13`	`* NOTES`
`14`	`14`	`* A lock table is a shared memory hash table. When`
`@@ -1790,7 +1790,7 @@ LockReassignCurrentOwner(void)`
`1790`	`1790`	`VirtualTransactionId*`
`1791`	`1791`	`GetLockConflicts(constLOCKTAG*locktag,LOCKMODElockmode)`
`1792`	`1792`	`{`
`1793`		`-staticVirtualTransactionId*vxids=NULL;`
	`1793`	`+staticVirtualTransactionId*vxids;`
`1794`	`1794`	`LOCKMETHODIDlockmethodid=locktag->locktag_lockmethodid;`
`1795`	`1795`	`LockMethodlockMethodTable;`
`1796`	`1796`	`LOCK*lock;`
`@@ -1810,24 +1810,18 @@ GetLockConflicts(const LOCKTAG *locktag, LOCKMODE lockmode)`
`1810`	`1810`	`/*`
`1811`	`1811`	`* Allocate memory to store results, and fill with InvalidVXID. We only`
`1812`	`1812`	`* need enough space for MaxBackends + a terminator, since prepared xacts`
`1813`		`- * don't count.`
	`1813`	`+ * don't count. InHotStandby allocate once in TopMemoryContext.`
`1814`	`1814`	`*/`
`1815`		`-if (!InHotStandby)`
`1816`		`-vxids= (VirtualTransactionId*)`
`1817`		`-palloc0(sizeof(VirtualTransactionId)* (MaxBackends+1));`
`1818`		`-else`
	`1815`	`+if (InHotStandby)`
`1819`	`1816`	`{`
`1820`	`1817`	`if (vxids==NULL)`
`1821`		`-{`
`1822`	`1818`	`vxids= (VirtualTransactionId*)`
`1823`		`-malloc(sizeof(VirtualTransactionId)* (MaxBackends+1));`
`1824`		`-if (vxids==NULL)`
`1825`		`-ereport(ERROR,`
`1826`		`-(errcode(ERRCODE_OUT_OF_MEMORY),`
`1827`		`-errmsg("out of memory")));`
`1828`		`-`
`1829`		`-}`
	`1819`	`+MemoryContextAlloc(TopMemoryContext,`
	`1820`	`+sizeof(VirtualTransactionId)* (MaxBackends+1));`
`1830`	`1821`	`}`
	`1822`	`+else`
	`1823`	`+vxids= (VirtualTransactionId*)`
	`1824`	`+palloc0(sizeof(VirtualTransactionId)* (MaxBackends+1));`
`1831`	`1825`
`1832`	`1826`	`/*`
`1833`	`1827`	`* Look up the lock object matching the tag.`

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!

Commit29eedd3

File tree

1 file changed

1 file changed

`‎src/backend/storage/lmgr/lock.c`

0 commit comments