diff --git a/include/mpool.h b/include/mpool.h index 910e0782aa9d..17efb3f82cfc 100644 --- a/include/mpool.h +++ b/include/mpool.h @@ -1,135 +1,140 @@ /*- * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the University of * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * * @(#)mpool.h 8.1 (Berkeley) 6/2/93 */ +#ifndef _MPOOL_H_ +#define _MPOOL_H_ + /* * 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 * on a hash chain (hashed by the page number) and an lru chain. Inactive * pages are threaded on a free chain. Each reference to a memory pool is * handed an MPOOL which is the opaque cookie passed to all of the memory * routines. */ #define HASHSIZE 128 #define HASHKEY(pgno) ((pgno - 1) % HASHSIZE) /* The BKT structures are the elements of the lists. */ typedef struct BKT { 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 */ void *page; /* page */ pgno_t pgno; /* page number */ #define MPOOL_DIRTY 0x01 /* page needs to be written */ #define MPOOL_PINNED 0x02 /* page is pinned into memory */ unsigned long flags; /* flags */ } 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 { BKTHDR free; /* The free list. */ BKTHDR lru; /* The LRU list. */ BKTHDR hashtable[HASHSIZE]; /* Hashed list by page number. */ pgno_t curcache; /* Current number of cached pages. */ pgno_t maxcache; /* Max number of cached pages. */ pgno_t npages; /* Number of pages in the file. */ u_long pagesize; /* File page size. */ int fd; /* File descriptor. */ /* Page in conversion routine. */ void (*pgin) __P((void *, pgno_t, void *)); /* Page out conversion routine. */ void (*pgout) __P((void *, pgno_t, void *)); void *pgcookie; /* Cookie for page in/out routines. */ #ifdef STATISTICS unsigned long cachehit; unsigned long cachemiss; unsigned long pagealloc; unsigned long pageflush; unsigned long pageget; unsigned long pagenew; unsigned long pageput; unsigned long pageread; unsigned long pagewrite; #endif } 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 MPOOL *mpool_open __P((DBT *, int, pgno_t, pgno_t)); void mpool_filter __P((MPOOL *, void (*)(void *, pgno_t, void *), void (*)(void *, pgno_t, void *), void *)); void *mpool_new __P((MPOOL *, pgno_t *)); void *mpool_get __P((MPOOL *, pgno_t, u_int)); int mpool_put __P((MPOOL *, void *, u_int)); int mpool_sync __P((MPOOL *)); int mpool_close __P((MPOOL *)); #ifdef STATISTICS void mpool_stat __P((MPOOL *)); #endif __END_DECLS + +#endif diff --git a/include/stab.h b/include/stab.h index 0eae57992d61..9200f52f3d51 100644 --- a/include/stab.h +++ b/include/stab.h @@ -1,67 +1,72 @@ /*- * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the University of * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * * @(#)stab.h 8.1 (Berkeley) 6/2/93 */ +#ifndef _STAB_H_ +#define _STAB_H_ + /* * The following are symbols used by various debuggers and by the Pascal * compiler. Each of them must have one (or more) of the bits defined by * the N_STAB mask set. */ #define N_GSYM 0x20 /* global symbol */ #define N_FNAME 0x22 /* F77 function name */ #define N_FUN 0x24 /* procedure name */ #define N_STSYM 0x26 /* data segment variable */ #define N_LCSYM 0x28 /* bss segment variable */ #define N_MAIN 0x2a /* main function name */ #define N_PC 0x30 /* global Pascal symbol */ #define N_RSYM 0x40 /* register variable */ #define N_SLINE 0x44 /* text segment line number */ #define N_DSLINE 0x46 /* data segment line number */ #define N_BSLINE 0x48 /* bss segment line number */ #define N_SSYM 0x60 /* structure/union element */ #define N_SO 0x64 /* main source file name */ #define N_LSYM 0x80 /* stack variable */ #define N_BINCL 0x82 /* include file beginning */ #define N_SOL 0x84 /* included source file name */ #define N_PSYM 0xa0 /* parameter variable */ #define N_EINCL 0xa2 /* include file end */ #define N_ENTRY 0xa4 /* alternate entry point */ #define N_LBRAC 0xc0 /* left bracket */ #define N_EXCL 0xc2 /* deleted include file */ #define N_RBRAC 0xe0 /* right bracket */ #define N_BCOMM 0xe2 /* begin common */ #define N_ECOMM 0xe4 /* end common */ #define N_ECOML 0xe8 /* end common (local name) */ #define N_LENG 0xfe /* length of preceding entry */ + +#endif