* Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $PostgreSQL: pgsql/src/backend/access/transam/clog.c,v 1.35 2005/12/06 18:10:06 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/access/transam/clog.c,v 1.36 2005/12/06 23:08:32 tgl Exp $
*
*-------------------------------------------------------------------------
*/
Size
CLOGShmemSize(void)
{
- return SimpleLruShmemSize();
+ return SimpleLruShmemSize(NUM_CLOG_BUFFERS);
}
void
CLOGShmemInit(void)
{
ClogCtl->PagePrecedes = CLOGPagePrecedes;
- SimpleLruInit(ClogCtl, "CLOG Ctl", CLogControlLock, "pg_clog");
+ SimpleLruInit(ClogCtl, "CLOG Ctl", NUM_CLOG_BUFFERS,
+ CLogControlLock, "pg_clog");
}
/*
* Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $PostgreSQL: pgsql/src/backend/access/transam/multixact.c,v 1.14 2005/12/06 18:10:06 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/access/transam/multixact.c,v 1.15 2005/12/06 23:08:32 tgl Exp $
*
*-------------------------------------------------------------------------
*/
mul_size(sizeof(MultiXactId) * 2, MaxBackends))
size = SHARED_MULTIXACT_STATE_SIZE;
- size = add_size(size, SimpleLruShmemSize());
- size = add_size(size, SimpleLruShmemSize());
+ size = add_size(size, SimpleLruShmemSize(NUM_MXACTOFFSET_BUFFERS));
+ size = add_size(size, SimpleLruShmemSize(NUM_MXACTMEMBER_BUFFERS));
return size;
}
MultiXactOffsetCtl->PagePrecedes = MultiXactOffsetPagePrecedes;
MultiXactMemberCtl->PagePrecedes = MultiXactMemberPagePrecedes;
- SimpleLruInit(MultiXactOffsetCtl, "MultiXactOffset Ctl",
+ SimpleLruInit(MultiXactOffsetCtl,
+ "MultiXactOffset Ctl", NUM_MXACTOFFSET_BUFFERS,
MultiXactOffsetControlLock, "pg_multixact/offsets");
- SimpleLruInit(MultiXactMemberCtl, "MultiXactMember Ctl",
+ SimpleLruInit(MultiXactMemberCtl,
+ "MultiXactMember Ctl", NUM_MXACTMEMBER_BUFFERS,
MultiXactMemberControlLock, "pg_multixact/members");
/* Initialize our shared state struct */
* Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $PostgreSQL: pgsql/src/backend/access/transam/slru.c,v 1.32 2005/12/06 18:10:06 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/access/transam/slru.c,v 1.33 2005/12/06 23:08:32 tgl Exp $
*
*-------------------------------------------------------------------------
*/
* until control returns to SimpleLruFlush(). This data structure remembers
* which files are open.
*/
+#define MAX_FLUSH_BUFFERS 16
+
typedef struct SlruFlushData
{
- int num_files; /* # files actually open */
- int fd[NUM_SLRU_BUFFERS]; /* their FD's */
- int segno[NUM_SLRU_BUFFERS]; /* their log seg#s */
+ int num_files; /* # files actually open */
+ int fd[MAX_FLUSH_BUFFERS]; /* their FD's */
+ int segno[MAX_FLUSH_BUFFERS]; /* their log seg#s */
} SlruFlushData;
/*
*/
Size
-SimpleLruShmemSize(void)
+SimpleLruShmemSize(int nslots)
{
- /* we assume NUM_SLRU_BUFFERS isn't so large as to risk overflow */
- return BUFFERALIGN(sizeof(SlruSharedData)) + BLCKSZ * NUM_SLRU_BUFFERS;
+ Size sz;
+
+ /* we assume nslots isn't so large as to risk overflow */
+ sz = MAXALIGN(sizeof(SlruSharedData));
+ sz += MAXALIGN(nslots * sizeof(char *)); /* page_buffer[] */
+ sz += MAXALIGN(nslots * sizeof(SlruPageStatus)); /* page_status[] */
+ 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(LWLockId)); /* buffer_locks[] */
+
+ return BUFFERALIGN(sz) + BLCKSZ * nslots;
}
void
-SimpleLruInit(SlruCtl ctl, const char *name,
+SimpleLruInit(SlruCtl ctl, const char *name, int nslots,
LWLockId ctllock, const char *subdir)
{
SlruShared shared;
bool found;
- shared = (SlruShared) ShmemInitStruct(name, SimpleLruShmemSize(), &found);
+ shared = (SlruShared) ShmemInitStruct(name,
+ SimpleLruShmemSize(nslots),
+ &found);
if (!IsUnderPostmaster)
{
/* Initialize locks and shared memory area */
- char *bufptr;
+ char *ptr;
+ Size offset;
int slotno;
Assert(!found);
shared->ControlLock = ctllock;
- bufptr = (char *) shared + BUFFERALIGN(sizeof(SlruSharedData));
+ shared->num_slots = nslots;
+
+ shared->cur_lru_count = 0;
+
+ /* shared->latest_page_number will be set later */
- for (slotno = 0; slotno < NUM_SLRU_BUFFERS; slotno++)
+ ptr = (char *) shared;
+ offset = MAXALIGN(sizeof(SlruSharedData));
+ shared->page_buffer = (char **) (ptr + offset);
+ offset += MAXALIGN(nslots * sizeof(char *));
+ shared->page_status = (SlruPageStatus *) (ptr + offset);
+ offset += MAXALIGN(nslots * sizeof(SlruPageStatus));
+ shared->page_dirty = (bool *) (ptr + offset);
+ offset += MAXALIGN(nslots * sizeof(bool));
+ shared->page_number = (int *) (ptr + offset);
+ offset += MAXALIGN(nslots * sizeof(int));
+ shared->page_lru_count = (int *) (ptr + offset);
+ offset += MAXALIGN(nslots * sizeof(int));
+ shared->buffer_locks = (LWLockId *) (ptr + offset);
+ offset += MAXALIGN(nslots * sizeof(LWLockId));
+ ptr += BUFFERALIGN(offset);
+
+ for (slotno = 0; slotno < nslots; slotno++)
{
- shared->page_buffer[slotno] = bufptr;
+ 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();
- bufptr += BLCKSZ;
+ ptr += BLCKSZ;
}
-
- /* shared->latest_page_number will be set later */
}
else
Assert(found);
LWLockAcquire(shared->ControlLock, LW_SHARED);
/* See if page is already in a buffer */
- for (slotno = 0; slotno < NUM_SLRU_BUFFERS; slotno++)
+ for (slotno = 0; slotno < shared->num_slots; slotno++)
{
if (shared->page_number[slotno] == pageno &&
shared->page_status[slotno] != SLRU_PAGE_EMPTY &&
if (fdata)
{
- fdata->fd[fdata->num_files] = fd;
- fdata->segno[fdata->num_files] = segno;
- fdata->num_files++;
+ if (fdata->num_files < MAX_FLUSH_BUFFERS)
+ {
+ fdata->fd[fdata->num_files] = fd;
+ fdata->segno[fdata->num_files] = segno;
+ fdata->num_files++;
+ }
+ else
+ {
+ /*
+ * In the unlikely event that we exceed MAX_FLUSH_BUFFERS,
+ * fall back to treating it as a standalone write.
+ */
+ fdata = NULL;
+ }
}
}
int best_page_number;
/* See if page already has a buffer assigned */
- for (slotno = 0; slotno < NUM_SLRU_BUFFERS; slotno++)
+ for (slotno = 0; slotno < shared->num_slots; slotno++)
{
if (shared->page_number[slotno] == pageno &&
shared->page_status[slotno] != SLRU_PAGE_EMPTY)
best_delta = -1;
bestslot = 0; /* no-op, just keeps compiler quiet */
best_page_number = 0; /* ditto */
- for (slotno = 0; slotno < NUM_SLRU_BUFFERS; slotno++)
+ for (slotno = 0; slotno < shared->num_slots; slotno++)
{
int this_delta;
int this_page_number;
LWLockAcquire(shared->ControlLock, LW_EXCLUSIVE);
- for (slotno = 0; slotno < NUM_SLRU_BUFFERS; slotno++)
+ for (slotno = 0; slotno < shared->num_slots; slotno++)
{
SimpleLruWritePage(ctl, slotno, &fdata);
return;
}
- for (slotno = 0; slotno < NUM_SLRU_BUFFERS; slotno++)
+ for (slotno = 0; slotno < shared->num_slots; slotno++)
{
if (shared->page_status[slotno] == SLRU_PAGE_EMPTY)
continue;
* Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $PostgreSQL: pgsql/src/backend/access/transam/subtrans.c,v 1.14 2005/12/06 18:10:06 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/access/transam/subtrans.c,v 1.15 2005/12/06 23:08:32 tgl Exp $
*
*-------------------------------------------------------------------------
*/
Size
SUBTRANSShmemSize(void)
{
- return SimpleLruShmemSize();
+ return SimpleLruShmemSize(NUM_SUBTRANS_BUFFERS);
}
void
SUBTRANSShmemInit(void)
{
SubTransCtl->PagePrecedes = SubTransPagePrecedes;
- SimpleLruInit(SubTransCtl, "SUBTRANS Ctl",
+ SimpleLruInit(SubTransCtl, "SUBTRANS Ctl", NUM_SUBTRANS_BUFFERS,
SubtransControlLock, "pg_subtrans");
/* Override default assumption that writes should be fsync'd */
SubTransCtl->do_fsync = false;
* Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/storage/lmgr/lwlock.c,v 1.34 2005/10/15 02:49:26 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/storage/lmgr/lwlock.c,v 1.35 2005/12/06 23:08:33 tgl Exp $
*
*-------------------------------------------------------------------------
*/
#include "postgres.h"
-#include "access/slru.h"
+#include "access/clog.h"
+#include "access/multixact.h"
+#include "access/subtrans.h"
#include "storage/lwlock.h"
#include "storage/proc.h"
#include "storage/spin.h"
numLocks += 2 * NBuffers;
/* clog.c needs one per CLOG buffer */
- numLocks += NUM_SLRU_BUFFERS;
+ numLocks += NUM_CLOG_BUFFERS;
/* subtrans.c needs one per SubTrans buffer */
- numLocks += NUM_SLRU_BUFFERS;
+ numLocks += NUM_SUBTRANS_BUFFERS;
- /*
- * multixact.c needs one per MultiXact buffer, but there are two SLRU
- * areas for MultiXact
- */
- numLocks += 2 * NUM_SLRU_BUFFERS;
+ /* multixact.c needs two SLRU areas */
+ numLocks += NUM_MXACTOFFSET_BUFFERS + NUM_MXACTMEMBER_BUFFERS;
/* Leave a few extra for use by user-defined modules. */
numLocks += NUM_USER_DEFINED_LWLOCKS;
* Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $PostgreSQL: pgsql/src/include/access/clog.h,v 1.14 2005/08/20 23:26:29 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/access/clog.h,v 1.15 2005/12/06 23:08:34 tgl Exp $
*/
#ifndef CLOG_H
#define CLOG_H
#define TRANSACTION_STATUS_SUB_COMMITTED 0x03
+/* Number of SLRU buffers to use for clog */
+#define NUM_CLOG_BUFFERS 8
+
+
extern void TransactionIdSetStatus(TransactionId xid, XidStatus status);
extern XidStatus TransactionIdGetStatus(TransactionId xid);
* Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $PostgreSQL: pgsql/src/include/access/multixact.h,v 1.7 2005/10/15 02:49:42 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/access/multixact.h,v 1.8 2005/12/06 23:08:34 tgl Exp $
*/
#ifndef MULTIXACT_H
#define MULTIXACT_H
#define MultiXactIdIsValid(multi) ((multi) != InvalidMultiXactId)
+/* Number of SLRU buffers to use for multixact */
+#define NUM_MXACTOFFSET_BUFFERS 8
+#define NUM_MXACTMEMBER_BUFFERS 16
+
/* ----------------
* multixact-related XLOG entries
* ----------------
* Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $PostgreSQL: pgsql/src/include/access/slru.h,v 1.16 2005/12/06 18:10:06 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/access/slru.h,v 1.17 2005/12/06 23:08:34 tgl Exp $
*
*-------------------------------------------------------------------------
*/
#include "storage/lwlock.h"
-/*
- * Number of page buffers. Ideally this could be different for CLOG and
- * SUBTRANS, but the benefit doesn't seem to be worth any additional
- * notational cruft.
- */
-#define NUM_SLRU_BUFFERS 8
-
/*
* 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;
{
LWLockId ControlLock;
+ /* Number of buffers managed by this SLRU structure */
+ int num_slots;
+
/*
- * Info for each buffer slot. Page number is undefined when status is
- * EMPTY.
+ * Arrays holding info for each buffer slot. Page number is undefined
+ * when status is EMPTY, as is page_lru_count.
*/
- char *page_buffer[NUM_SLRU_BUFFERS];
- SlruPageStatus page_status[NUM_SLRU_BUFFERS];
- bool page_dirty[NUM_SLRU_BUFFERS];
- int page_number[NUM_SLRU_BUFFERS];
- int page_lru_count[NUM_SLRU_BUFFERS];
- LWLockId buffer_locks[NUM_SLRU_BUFFERS];
+ char **page_buffer;
+ SlruPageStatus *page_status;
+ bool *page_dirty;
+ int *page_number;
+ int *page_lru_count;
+ LWLockId *buffer_locks;
/*----------
* We mark a page "most recently used" by setting
typedef struct SlruFlushData *SlruFlush;
-extern Size SimpleLruShmemSize(void);
-extern void SimpleLruInit(SlruCtl ctl, const char *name,
+extern Size SimpleLruShmemSize(int nslots);
+extern void SimpleLruInit(SlruCtl ctl, const char *name, int nslots,
LWLockId ctllock, const char *subdir);
extern int SimpleLruZeroPage(SlruCtl ctl, int pageno);
extern int SimpleLruReadPage(SlruCtl ctl, int pageno, TransactionId xid);
* Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $PostgreSQL: pgsql/src/include/access/subtrans.h,v 1.7 2005/08/20 23:26:29 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/access/subtrans.h,v 1.8 2005/12/06 23:08:34 tgl Exp $
*/
#ifndef SUBTRANS_H
#define SUBTRANS_H
+/* Number of SLRU buffers to use for subtrans */
+#define NUM_SUBTRANS_BUFFERS 32
+
extern void SubTransSetParent(TransactionId xid, TransactionId parent);
extern TransactionId SubTransGetParent(TransactionId xid);
extern TransactionId SubTransGetTopmostTransaction(TransactionId xid);
projects / postgresql.git / commitdiff