Fix conflicts and merge into mainline (this may get cvs admined out and redone properly by Peter later)
This commit is contained in:
parent
f1e396bc53
commit
90fd5bdfbf
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=14288
@ -1,5 +1,5 @@
|
|||||||
/*-
|
/*-
|
||||||
* Copyright (c) 1990, 1993
|
* Copyright (c) 1990, 1993, 1994
|
||||||
* The Regents of the University of California. All rights reserved.
|
* The Regents of the University of California. All rights reserved.
|
||||||
*
|
*
|
||||||
* Redistribution and use in source and binary forms, with or without
|
* Redistribution and use in source and binary forms, with or without
|
||||||
@ -30,7 +30,7 @@
|
|||||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||||
* SUCH DAMAGE.
|
* SUCH DAMAGE.
|
||||||
*
|
*
|
||||||
* @(#)db.h 8.4 (Berkeley) 2/21/94
|
* @(#)db.h 8.7 (Berkeley) 6/16/94
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef _DB_H_
|
#ifndef _DB_H_
|
||||||
@ -152,7 +152,7 @@ typedef struct {
|
|||||||
int lorder; /* byte order */
|
int lorder; /* byte order */
|
||||||
size_t reclen; /* record length (fixed-length records) */
|
size_t reclen; /* record length (fixed-length records) */
|
||||||
u_char bval; /* delimiting byte (variable-length records */
|
u_char bval; /* delimiting byte (variable-length records */
|
||||||
char *bfname; /* btree file name */
|
char *bfname; /* btree file name */
|
||||||
} RECNOINFO;
|
} RECNOINFO;
|
||||||
|
|
||||||
#ifdef __DBINTERFACE_PRIVATE
|
#ifdef __DBINTERFACE_PRIVATE
|
||||||
|
110
include/mpool.h
110
include/mpool.h
@ -1,5 +1,5 @@
|
|||||||
/*-
|
/*-
|
||||||
* Copyright (c) 1991, 1993
|
* Copyright (c) 1991, 1993, 1994
|
||||||
* The Regents of the University of California. All rights reserved.
|
* The Regents of the University of California. All rights reserved.
|
||||||
*
|
*
|
||||||
* Redistribution and use in source and binary forms, with or without
|
* Redistribution and use in source and binary forms, with or without
|
||||||
@ -30,101 +30,65 @@
|
|||||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||||
* SUCH DAMAGE.
|
* SUCH DAMAGE.
|
||||||
*
|
*
|
||||||
* @(#)mpool.h 8.1 (Berkeley) 6/2/93
|
* @(#)mpool.h 8.2 (Berkeley) 7/14/94
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef _MPOOL_H_
|
#ifndef _MPOOL_H_
|
||||||
#define _MPOOL_H_
|
#define _MPOOL_H_
|
||||||
|
|
||||||
|
#include <sys/queue.h>
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* The memory pool scheme is a simple one. Each in memory page is referenced
|
* The memory pool scheme is a simple one. Each in-memory page is referenced
|
||||||
* by a bucket which is threaded in three ways. All active pages are threaded
|
* by a bucket which is threaded in up to two of three ways. All active pages
|
||||||
* on a hash chain (hashed by the page number) and an lru chain. Inactive
|
* are threaded on a hash chain (hashed by page number) and an lru chain.
|
||||||
* pages are threaded on a free chain. Each reference to a memory pool is
|
* Inactive pages are threaded on a free chain. Each reference to a memory
|
||||||
* handed an MPOOL which is the opaque cookie passed to all of the memory
|
* pool is handed an opaque MPOOL cookie which stores all of this information.
|
||||||
* routines.
|
|
||||||
*/
|
*/
|
||||||
#define HASHSIZE 128
|
#define HASHSIZE 128
|
||||||
#define HASHKEY(pgno) ((pgno - 1) % HASHSIZE)
|
#define HASHKEY(pgno) ((pgno - 1) % HASHSIZE)
|
||||||
|
|
||||||
/* The BKT structures are the elements of the lists. */
|
/* The BKT structures are the elements of the queues. */
|
||||||
typedef struct BKT {
|
typedef struct _bkt {
|
||||||
struct BKT *hnext; /* next hash bucket */
|
CIRCLEQ_ENTRY(_bkt) hq; /* hash queue */
|
||||||
struct BKT *hprev; /* previous hash bucket */
|
CIRCLEQ_ENTRY(_bkt) q; /* lru queue */
|
||||||
struct BKT *cnext; /* next free/lru bucket */
|
void *page; /* page */
|
||||||
struct BKT *cprev; /* previous free/lru bucket */
|
pgno_t pgno; /* page number */
|
||||||
void *page; /* page */
|
|
||||||
pgno_t pgno; /* page number */
|
|
||||||
|
|
||||||
#define MPOOL_DIRTY 0x01 /* page needs to be written */
|
#define MPOOL_DIRTY 0x01 /* page needs to be written */
|
||||||
#define MPOOL_PINNED 0x02 /* page is pinned into memory */
|
#define MPOOL_PINNED 0x02 /* page is pinned into memory */
|
||||||
unsigned long flags; /* flags */
|
u_int8_t flags; /* flags */
|
||||||
} BKT;
|
} BKT;
|
||||||
|
|
||||||
/* The BKTHDR structures are the heads of the lists. */
|
|
||||||
typedef struct BKTHDR {
|
|
||||||
struct BKT *hnext; /* next hash bucket */
|
|
||||||
struct BKT *hprev; /* previous hash bucket */
|
|
||||||
struct BKT *cnext; /* next free/lru bucket */
|
|
||||||
struct BKT *cprev; /* previous free/lru bucket */
|
|
||||||
} BKTHDR;
|
|
||||||
|
|
||||||
typedef struct MPOOL {
|
typedef struct MPOOL {
|
||||||
BKTHDR free; /* The free list. */
|
CIRCLEQ_HEAD(_lqh, _bkt) lqh; /* lru queue head */
|
||||||
BKTHDR lru; /* The LRU list. */
|
/* hash queue array */
|
||||||
BKTHDR hashtable[HASHSIZE]; /* Hashed list by page number. */
|
CIRCLEQ_HEAD(_hqh, _bkt) hqh[HASHSIZE];
|
||||||
pgno_t curcache; /* Current number of cached pages. */
|
pgno_t curcache; /* current number of cached pages */
|
||||||
pgno_t maxcache; /* Max number of cached pages. */
|
pgno_t maxcache; /* max number of cached pages */
|
||||||
pgno_t npages; /* Number of pages in the file. */
|
pgno_t npages; /* number of pages in the file */
|
||||||
u_long pagesize; /* File page size. */
|
u_long pagesize; /* file page size */
|
||||||
int fd; /* File descriptor. */
|
int fd; /* file descriptor */
|
||||||
/* Page in conversion routine. */
|
/* page in conversion routine */
|
||||||
void (*pgin) __P((void *, pgno_t, void *));
|
void (*pgin) __P((void *, pgno_t, void *));
|
||||||
/* Page out conversion routine. */
|
/* page out conversion routine */
|
||||||
void (*pgout) __P((void *, pgno_t, void *));
|
void (*pgout) __P((void *, pgno_t, void *));
|
||||||
void *pgcookie; /* Cookie for page in/out routines. */
|
void *pgcookie; /* cookie for page in/out routines */
|
||||||
#ifdef STATISTICS
|
#ifdef STATISTICS
|
||||||
unsigned long cachehit;
|
u_long cachehit;
|
||||||
unsigned long cachemiss;
|
u_long cachemiss;
|
||||||
unsigned long pagealloc;
|
u_long pagealloc;
|
||||||
unsigned long pageflush;
|
u_long pageflush;
|
||||||
unsigned long pageget;
|
u_long pageget;
|
||||||
unsigned long pagenew;
|
u_long pagenew;
|
||||||
unsigned long pageput;
|
u_long pageput;
|
||||||
unsigned long pageread;
|
u_long pageread;
|
||||||
unsigned long pagewrite;
|
u_long pagewrite;
|
||||||
#endif
|
#endif
|
||||||
} MPOOL;
|
} MPOOL;
|
||||||
|
|
||||||
#ifdef __MPOOLINTERFACE_PRIVATE
|
|
||||||
/* Macros to insert/delete into/from hash chain. */
|
|
||||||
#define rmhash(bp) { \
|
|
||||||
(bp)->hprev->hnext = (bp)->hnext; \
|
|
||||||
(bp)->hnext->hprev = (bp)->hprev; \
|
|
||||||
}
|
|
||||||
#define inshash(bp, pg) { \
|
|
||||||
hp = &mp->hashtable[HASHKEY(pg)]; \
|
|
||||||
(bp)->hnext = hp->hnext; \
|
|
||||||
(bp)->hprev = (struct BKT *)hp; \
|
|
||||||
hp->hnext->hprev = (bp); \
|
|
||||||
hp->hnext = (bp); \
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Macros to insert/delete into/from lru and free chains. */
|
|
||||||
#define rmchain(bp) { \
|
|
||||||
(bp)->cprev->cnext = (bp)->cnext; \
|
|
||||||
(bp)->cnext->cprev = (bp)->cprev; \
|
|
||||||
}
|
|
||||||
#define inschain(bp, dp) { \
|
|
||||||
(bp)->cnext = (dp)->cnext; \
|
|
||||||
(bp)->cprev = (struct BKT *)(dp); \
|
|
||||||
(dp)->cnext->cprev = (bp); \
|
|
||||||
(dp)->cnext = (bp); \
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
__BEGIN_DECLS
|
__BEGIN_DECLS
|
||||||
MPOOL *mpool_open __P((DBT *, int, pgno_t, pgno_t));
|
MPOOL *mpool_open __P((void *, int, pgno_t, pgno_t));
|
||||||
void mpool_filter __P((MPOOL *, void (*)(void *, pgno_t, void *),
|
void mpool_filter __P((MPOOL *, void (*)(void *, pgno_t, void *),
|
||||||
void (*)(void *, pgno_t, void *), void *));
|
void (*)(void *, pgno_t, void *), void *));
|
||||||
void *mpool_new __P((MPOOL *, pgno_t *));
|
void *mpool_new __P((MPOOL *, pgno_t *));
|
||||||
|
Loading…
Reference in New Issue
Block a user