mirror of
https://github.com/postgres/postgres.git
synced 2025-09-09 13:09:39 +03:00
Fix assorted defects in 09adc9a8c0
.
That commit increased all shared memory allocations to the next higher multiple of PG_CACHE_LINE_SIZE, but it didn't ensure that allocation started on a cache line boundary. It also failed to remove a couple other pieces of now-useless code. BUFFERALIGN() is perhaps obsolete at this point, and likely should be removed at some point, too, but that seems like it can be left to a future cleanup. Mistakes all pointed out by Andres Freund. The patch is mine, with a few extra assertions which I adopted from his version of this fix.
This commit is contained in:
@@ -76,11 +76,9 @@ InitBufferPool(void)
|
||||
|
||||
/* Align descriptors to a cacheline boundary. */
|
||||
BufferDescriptors = (BufferDescPadded *)
|
||||
CACHELINEALIGN(
|
||||
ShmemInitStruct("Buffer Descriptors",
|
||||
NBuffers * sizeof(BufferDescPadded)
|
||||
+ PG_CACHE_LINE_SIZE,
|
||||
&foundDescs));
|
||||
ShmemInitStruct("Buffer Descriptors",
|
||||
NBuffers * sizeof(BufferDescPadded),
|
||||
&foundDescs);
|
||||
|
||||
BufferBlocks = (char *)
|
||||
ShmemInitStruct("Buffer Blocks",
|
||||
@@ -88,10 +86,9 @@ InitBufferPool(void)
|
||||
|
||||
/* Align lwlocks to cacheline boundary */
|
||||
BufferIOLWLockArray = (LWLockMinimallyPadded *)
|
||||
CACHELINEALIGN(ShmemInitStruct("Buffer IO Locks",
|
||||
NBuffers * (Size) sizeof(LWLockMinimallyPadded)
|
||||
+ PG_CACHE_LINE_SIZE,
|
||||
&foundIOLocks));
|
||||
ShmemInitStruct("Buffer IO Locks",
|
||||
NBuffers * (Size) sizeof(LWLockMinimallyPadded),
|
||||
&foundIOLocks);
|
||||
|
||||
BufferIOLWLockTranche.name = "buffer_io";
|
||||
BufferIOLWLockTranche.array_base = BufferIOLWLockArray;
|
||||
|
Reference in New Issue
Block a user