diff options
Diffstat (limited to 'src/backend/access/transam')
| -rw-r--r-- | src/backend/access/transam/slru.c | 6 | ||||
| -rw-r--r-- | src/backend/access/transam/xlog.c | 9 |
2 files changed, 4 insertions, 11 deletions
diff --git a/src/backend/access/transam/slru.c b/src/backend/access/transam/slru.c index bbae5847f2d..8b95f35dbaf 100644 --- a/src/backend/access/transam/slru.c +++ b/src/backend/access/transam/slru.c @@ -216,9 +216,6 @@ SimpleLruInit(SlruCtl ctl, const char *name, int nslots, int nlsns, Assert(strlen(name) + 1 < SLRU_MAX_NAME_LENGTH); strlcpy(shared->lwlock_tranche_name, name, SLRU_MAX_NAME_LENGTH); shared->lwlock_tranche_id = tranche_id; - shared->lwlock_tranche.name = shared->lwlock_tranche_name; - shared->lwlock_tranche.array_base = shared->buffer_locks; - shared->lwlock_tranche.array_stride = sizeof(LWLockPadded); ptr += BUFFERALIGN(offset); for (slotno = 0; slotno < nslots; slotno++) @@ -237,7 +234,8 @@ SimpleLruInit(SlruCtl ctl, const char *name, int nslots, int nlsns, Assert(found); /* Register SLRU tranche in the main tranches array */ - LWLockRegisterTranche(shared->lwlock_tranche_id, &shared->lwlock_tranche); + LWLockRegisterTranche(shared->lwlock_tranche_id, + shared->lwlock_tranche_name); /* * Initialize the unshared control struct, including directory path. We diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index 084401d2f23..aa9ee5a0dd8 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -517,7 +517,6 @@ typedef struct XLogCtlInsert * WAL insertion locks. */ WALInsertLockPadded *WALInsertLocks; - LWLockTranche WALInsertLockTranche; } XLogCtlInsert; /* @@ -4688,7 +4687,7 @@ XLOGShmemInit(void) /* Initialize local copy of WALInsertLocks and register the tranche */ WALInsertLocks = XLogCtl->Insert.WALInsertLocks; LWLockRegisterTranche(LWTRANCHE_WAL_INSERT, - &XLogCtl->Insert.WALInsertLockTranche); + "wal_insert"); return; } memset(XLogCtl, 0, sizeof(XLogCtlData)); @@ -4711,11 +4710,7 @@ XLOGShmemInit(void) (WALInsertLockPadded *) allocptr; allocptr += sizeof(WALInsertLockPadded) * NUM_XLOGINSERT_LOCKS; - XLogCtl->Insert.WALInsertLockTranche.name = "wal_insert"; - XLogCtl->Insert.WALInsertLockTranche.array_base = WALInsertLocks; - XLogCtl->Insert.WALInsertLockTranche.array_stride = sizeof(WALInsertLockPadded); - - LWLockRegisterTranche(LWTRANCHE_WAL_INSERT, &XLogCtl->Insert.WALInsertLockTranche); + LWLockRegisterTranche(LWTRANCHE_WAL_INSERT, "wal_insert"); for (i = 0; i < NUM_XLOGINSERT_LOCKS; i++) { LWLockInitialize(&WALInsertLocks[i].l.lock, LWTRANCHE_WAL_INSERT); |