Move each SLRU's lwlocks to a separate tranche.

This makes it significantly easier to identify these lwlocks in
LWLOCK_STATS or Trace_lwlocks output.  It's also arguably better
from a modularity standpoint, since lwlock.c no longer needs to
know anything about the LWLock needs of the higher-level SLRU
facility.

Ildus Kurbangaliev, reviewd by Álvaro Herrera and by me.

diff --git a/src/backend/access/transam/clog.c b/src/backend/access/transam/clog.c
index 3a58f1ed8113283073f88087a903d255f145eb0d..ea836553d67d4990ffb4fa1d31d648f1b7cd5605 100644 (file)
--- a/src/backend/access/transam/clog.c
+++ b/src/backend/access/transam/clog.c
@@ -456,7 +456,7 @@ void
 CLOGShmemInit(void)
 {
    ClogCtl->PagePrecedes = CLOGPagePrecedes;
-   SimpleLruInit(ClogCtl, "CLOG Ctl", CLOGShmemBuffers(), CLOG_LSNS_PER_PAGE,
+   SimpleLruInit(ClogCtl, "clog", CLOGShmemBuffers(), CLOG_LSNS_PER_PAGE,
                  CLogControlLock, "pg_clog");
 }
 

diff --git a/src/backend/access/transam/commit_ts.c b/src/backend/access/transam/commit_ts.c
index b21a31345f76d44fadf1f3e69f9c4906fd30ae48..349228df1e540625f243350ae98c566102c362a2 100644 (file)
--- a/src/backend/access/transam/commit_ts.c
+++ b/src/backend/access/transam/commit_ts.c
@@ -478,7 +478,7 @@ CommitTsShmemInit(void)
    bool        found;
 
    CommitTsCtl->PagePrecedes = CommitTsPagePrecedes;
-   SimpleLruInit(CommitTsCtl, "CommitTs Ctl", CommitTsShmemBuffers(), 0,
+   SimpleLruInit(CommitTsCtl, "commit_timestamp", CommitTsShmemBuffers(), 0,
                  CommitTsControlLock, "pg_commit_ts");
 
    commitTsShared = ShmemInitStruct("CommitTs shared",

diff --git a/src/backend/access/transam/multixact.c b/src/backend/access/transam/multixact.c
index 7d97085a1a6cdeb2fe120d9aa52e58091c6d6a49..b66a2b60c8b017e43c062d61e54081e907fe4178 100644 (file)
--- a/src/backend/access/transam/multixact.c
+++ b/src/backend/access/transam/multixact.c
@@ -1838,10 +1838,10 @@ MultiXactShmemInit(void)
    MultiXactMemberCtl->PagePrecedes = MultiXactMemberPagePrecedes;
 
    SimpleLruInit(MultiXactOffsetCtl,
-                 "MultiXactOffset Ctl", NUM_MXACTOFFSET_BUFFERS, 0,
+                 "multixact_offset", NUM_MXACTOFFSET_BUFFERS, 0,
                  MultiXactOffsetControlLock, "pg_multixact/offsets");
    SimpleLruInit(MultiXactMemberCtl,
-                 "MultiXactMember Ctl", NUM_MXACTMEMBER_BUFFERS, 0,
+                 "multixact_member", NUM_MXACTMEMBER_BUFFERS, 0,
                  MultiXactMemberControlLock, "pg_multixact/members");
 
    /* Initialize our shared state struct */

diff --git a/src/backend/access/transam/slru.c b/src/backend/access/transam/slru.c
index 90c7cf56e63b4f375b2ca3c8eaa07ba5bbbf8a79..08979006275f0ad8afc80ffbaea36d89929bbc84 100644 (file)
--- a/src/backend/access/transam/slru.c
+++ b/src/backend/access/transam/slru.c
@@ -152,7 +152,7 @@ SimpleLruShmemSize(int nslots, int nlsns)
    sz += MAXALIGN(nslots * sizeof(bool));      /* page_dirty[] */
    sz += MAXALIGN(nslots * sizeof(int));       /* page_number[] */
    sz += MAXALIGN(nslots * sizeof(int));       /* page_lru_count[] */
-   sz += MAXALIGN(nslots * sizeof(LWLock *));  /* buffer_locks[] */
+   sz += MAXALIGN(nslots * sizeof(LWLockPadded)); /* buffer_locks[] */
 
    if (nlsns > 0)
        sz += MAXALIGN(nslots * nlsns * sizeof(XLogRecPtr));    /* group_lsn[] */
@@ -203,8 +203,6 @@ SimpleLruInit(SlruCtl ctl, const char *name, int nslots, int nlsns,
        offset += MAXALIGN(nslots * sizeof(int));
        shared->page_lru_count = (int *) (ptr + offset);
        offset += MAXALIGN(nslots * sizeof(int));
-       shared->buffer_locks = (LWLock **) (ptr + offset);
-       offset += MAXALIGN(nslots * sizeof(LWLock *));
 
        if (nlsns > 0)
        {
@@ -212,20 +210,35 @@ SimpleLruInit(SlruCtl ctl, const char *name, int nslots, int nlsns,
            offset += MAXALIGN(nslots * nlsns * sizeof(XLogRecPtr));
        }
 
+       /* Initialize LWLocks */
+       shared->buffer_locks = (LWLockPadded *) ShmemAlloc(sizeof(LWLockPadded) * nslots);
+
+       Assert(strlen(name) + 1 < SLRU_MAX_NAME_LENGTH);
+       strlcpy(shared->lwlock_tranche_name, name, SLRU_MAX_NAME_LENGTH);
+       shared->lwlock_tranche_id = LWLockNewTrancheId();
+       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++)
        {
+           LWLockInitialize(&shared->buffer_locks[slotno].lock,
+               shared->lwlock_tranche_id);
+
            shared->page_buffer[slotno] = ptr;
            shared->page_status[slotno] = SLRU_PAGE_EMPTY;
            shared->page_dirty[slotno] = false;
            shared->page_lru_count[slotno] = 0;
-           shared->buffer_locks[slotno] = LWLockAssign();
            ptr += BLCKSZ;
        }
    }
    else
        Assert(found);
 
+   /* Register SLRU tranche in the main tranches array */
+   LWLockRegisterTranche(shared->lwlock_tranche_id, &shared->lwlock_tranche);
+
    /*
     * Initialize the unshared control struct, including directory path. We
     * assume caller set PagePrecedes.
@@ -308,8 +321,8 @@ SimpleLruWaitIO(SlruCtl ctl, int slotno)
 
    /* See notes at top of file */
    LWLockRelease(shared->ControlLock);
-   LWLockAcquire(shared->buffer_locks[slotno], LW_SHARED);
-   LWLockRelease(shared->buffer_locks[slotno]);
+   LWLockAcquire(&shared->buffer_locks[slotno].lock, LW_SHARED);
+   LWLockRelease(&shared->buffer_locks[slotno].lock);
    LWLockAcquire(shared->ControlLock, LW_EXCLUSIVE);
 
    /*
@@ -323,7 +336,7 @@ SimpleLruWaitIO(SlruCtl ctl, int slotno)
    if (shared->page_status[slotno] == SLRU_PAGE_READ_IN_PROGRESS ||
        shared->page_status[slotno] == SLRU_PAGE_WRITE_IN_PROGRESS)
    {
-       if (LWLockConditionalAcquire(shared->buffer_locks[slotno], LW_SHARED))
+       if (LWLockConditionalAcquire(&shared->buffer_locks[slotno].lock, LW_SHARED))
        {
            /* indeed, the I/O must have failed */
            if (shared->page_status[slotno] == SLRU_PAGE_READ_IN_PROGRESS)
@@ -333,7 +346,7 @@ SimpleLruWaitIO(SlruCtl ctl, int slotno)
                shared->page_status[slotno] = SLRU_PAGE_VALID;
                shared->page_dirty[slotno] = true;
            }
-           LWLockRelease(shared->buffer_locks[slotno]);
+           LWLockRelease(&shared->buffer_locks[slotno].lock);
        }
    }
 }
@@ -402,7 +415,7 @@ SimpleLruReadPage(SlruCtl ctl, int pageno, bool write_ok,
        shared->page_dirty[slotno] = false;
 
        /* Acquire per-buffer lock (cannot deadlock, see notes at top) */
-       LWLockAcquire(shared->buffer_locks[slotno], LW_EXCLUSIVE);
+       LWLockAcquire(&shared->buffer_locks[slotno].lock, LW_EXCLUSIVE);
 
        /* Release control lock while doing I/O */
        LWLockRelease(shared->ControlLock);
@@ -422,7 +435,7 @@ SimpleLruReadPage(SlruCtl ctl, int pageno, bool write_ok,
 
        shared->page_status[slotno] = ok ? SLRU_PAGE_VALID : SLRU_PAGE_EMPTY;
 
-       LWLockRelease(shared->buffer_locks[slotno]);
+       LWLockRelease(&shared->buffer_locks[slotno].lock);
 
        /* Now it's okay to ereport if we failed */
        if (!ok)
@@ -518,7 +531,7 @@ SlruInternalWritePage(SlruCtl ctl, int slotno, SlruFlush fdata)
    shared->page_dirty[slotno] = false;
 
    /* Acquire per-buffer lock (cannot deadlock, see notes at top) */
-   LWLockAcquire(shared->buffer_locks[slotno], LW_EXCLUSIVE);
+   LWLockAcquire(&shared->buffer_locks[slotno].lock, LW_EXCLUSIVE);
 
    /* Release control lock while doing I/O */
    LWLockRelease(shared->ControlLock);
@@ -547,7 +560,7 @@ SlruInternalWritePage(SlruCtl ctl, int slotno, SlruFlush fdata)
 
    shared->page_status[slotno] = SLRU_PAGE_VALID;
 
-   LWLockRelease(shared->buffer_locks[slotno]);
+   LWLockRelease(&shared->buffer_locks[slotno].lock);
 
    /* Now it's okay to ereport if we failed */
    if (!ok)

diff --git a/src/backend/access/transam/subtrans.c b/src/backend/access/transam/subtrans.c
index 6b709823227803b6975c5a962e2dced57a8e0f97..36426c5bb6e1af471c81eaff2f6c87a2b352853e 100644 (file)
--- a/src/backend/access/transam/subtrans.c
+++ b/src/backend/access/transam/subtrans.c
@@ -178,7 +178,7 @@ void
 SUBTRANSShmemInit(void)
 {
    SubTransCtl->PagePrecedes = SubTransPagePrecedes;
-   SimpleLruInit(SubTransCtl, "SUBTRANS Ctl", NUM_SUBTRANS_BUFFERS, 0,
+   SimpleLruInit(SubTransCtl, "subtrans", NUM_SUBTRANS_BUFFERS, 0,
                  SubtransControlLock, "pg_subtrans");
    /* Override default assumption that writes should be fsync'd */
    SubTransCtl->do_fsync = false;

diff --git a/src/backend/commands/async.c b/src/backend/commands/async.c
index 5059e3de9276d739b3093f196ac30ecd12b5137e..38231c99e21ec165e9e86d99776818f744140337 100644 (file)
--- a/src/backend/commands/async.c
+++ b/src/backend/commands/async.c
@@ -479,7 +479,7 @@ AsyncShmemInit(void)
     * Set up SLRU management of the pg_notify data.
     */
    AsyncCtl->PagePrecedes = asyncQueuePagePrecedes;
-   SimpleLruInit(AsyncCtl, "Async Ctl", NUM_ASYNC_BUFFERS, 0,
+   SimpleLruInit(AsyncCtl, "async", NUM_ASYNC_BUFFERS, 0,
                  AsyncCtlLock, "pg_notify");
    /* Override default assumption that writes should be fsync'd */
    AsyncCtl->do_fsync = false;

diff --git a/src/backend/storage/lmgr/lwlock.c b/src/backend/storage/lmgr/lwlock.c
index fd4b479f10c9611c6ec35a3f349abefdffbf4a8b..6bca02c5f213be3f4f3f7156a3bf8d8d43af4b83 100644 (file)
--- a/src/backend/storage/lmgr/lwlock.c
+++ b/src/backend/storage/lmgr/lwlock.c
@@ -76,11 +76,6 @@
  */
 #include "postgres.h"
 
-#include "access/clog.h"
-#include "access/commit_ts.h"
-#include "access/multixact.h"
-#include "access/subtrans.h"
-#include "commands/async.h"
 #include "miscadmin.h"
 #include "pg_trace.h"
 #include "postmaster/postmaster.h"
@@ -364,24 +359,6 @@ NumLWLocks(void)
    /* proc.c needs one for each backend or auxiliary process */
    numLocks += MaxBackends + NUM_AUXILIARY_PROCS;
 
-   /* clog.c needs one per CLOG buffer */
-   numLocks += CLOGShmemBuffers();
-
-   /* commit_ts.c needs one per CommitTs buffer */
-   numLocks += CommitTsShmemBuffers();
-
-   /* subtrans.c needs one per SubTrans buffer */
-   numLocks += NUM_SUBTRANS_BUFFERS;
-
-   /* multixact.c needs two SLRU areas */
-   numLocks += NUM_MXACTOFFSET_BUFFERS + NUM_MXACTMEMBER_BUFFERS;
-
-   /* async.c needs one per Async buffer */
-   numLocks += NUM_ASYNC_BUFFERS;
-
-   /* predicate.c needs one per old serializable xid buffer */
-   numLocks += NUM_OLDSERXID_BUFFERS;
-
    /* slot.c needs one for each slot */
    numLocks += max_replication_slots;
 

diff --git a/src/backend/storage/lmgr/predicate.c b/src/backend/storage/lmgr/predicate.c
index 47b4adaf0e287781969fb010796dc8d9cbe897d4..4b4ad8146e07249df24bf18e0dbe6eab9f4bf0a5 100644 (file)
--- a/src/backend/storage/lmgr/predicate.c
+++ b/src/backend/storage/lmgr/predicate.c
@@ -794,7 +794,7 @@ OldSerXidInit(void)
     * Set up SLRU management of the pg_serial data.
     */
    OldSerXidSlruCtl->PagePrecedes = OldSerXidPagePrecedesLogically;
-   SimpleLruInit(OldSerXidSlruCtl, "OldSerXid SLRU Ctl",
+   SimpleLruInit(OldSerXidSlruCtl, "oldserxid",
                  NUM_OLDSERXID_BUFFERS, 0, OldSerXidLock, "pg_serial");
    /* Override default assumption that writes should be fsync'd */
    OldSerXidSlruCtl->do_fsync = false;

diff --git a/src/include/access/slru.h b/src/include/access/slru.h
index f60e75b569a2cce391e30d3ffcebf8a9c804a1e4..661abbc789b6850acbc86a1fdf21971e2e6d139d 100644 (file)
--- a/src/include/access/slru.h
+++ b/src/include/access/slru.h
@@ -36,6 +36,9 @@
  */
 #define SLRU_PAGES_PER_SEGMENT 32
 
+/* Maximum length of an SLRU name */
+#define SLRU_MAX_NAME_LENGTH   32
+
 /*
  * Page status codes.  Note that these do not include the "dirty" bit.
  * page_dirty can be TRUE only in the VALID or WRITE_IN_PROGRESS states;
@@ -69,7 +72,6 @@ typedef struct SlruSharedData
    bool       *page_dirty;
    int        *page_number;
    int        *page_lru_count;
-   LWLock    **buffer_locks;
 
    /*
     * Optional array of WAL flush LSNs associated with entries in the SLRU
@@ -99,6 +101,12 @@ typedef struct SlruSharedData
     * the latest page.
     */
    int         latest_page_number;
+
+   /* LWLocks */
+   int         lwlock_tranche_id;
+   LWLockTranche lwlock_tranche;
+   char        lwlock_tranche_name[SLRU_MAX_NAME_LENGTH];
+   LWLockPadded *buffer_locks;
 } SlruSharedData;
 
 typedef SlruSharedData *SlruShared;