diff options
Diffstat (limited to 'db2/include')
| -rw-r--r-- | db2/include/btree.h | 8 | ||||
| -rw-r--r-- | db2/include/btree_ext.h | 2 | ||||
| -rw-r--r-- | db2/include/db.h.src | 17 | ||||
| -rw-r--r-- | db2/include/db_185.h.src | 10 | ||||
| -rw-r--r-- | db2/include/db_cxx.h | 10 | ||||
| -rw-r--r-- | db2/include/db_ext.h | 4 | ||||
| -rw-r--r-- | db2/include/db_int.h.src | 14 | ||||
| -rw-r--r-- | db2/include/db_page.h | 32 | ||||
| -rw-r--r-- | db2/include/db_shash.h | 22 | ||||
| -rw-r--r-- | db2/include/hash_ext.h | 3 | ||||
| -rw-r--r-- | db2/include/lock.h | 8 | ||||
| -rw-r--r-- | db2/include/log.h | 10 | ||||
| -rw-r--r-- | db2/include/log_ext.h | 6 | ||||
| -rw-r--r-- | db2/include/mp.h | 6 | ||||
| -rw-r--r-- | db2/include/shqueue.h | 37 | ||||
| -rw-r--r-- | db2/include/txn.h | 27 |
16 files changed, 110 insertions, 106 deletions
diff --git a/db2/include/btree.h b/db2/include/btree.h index 5cf4224ae6..878096b7b2 100644 --- a/db2/include/btree.h +++ b/db2/include/btree.h @@ -43,7 +43,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#)btree.h 10.16 (Sleepycat) 8/24/97 + * @(#)btree.h 10.17 (Sleepycat) 9/23/97 */ /* Forward structure declarations. */ @@ -181,6 +181,12 @@ struct __cursor { #define C_DELETED 0x0001 #define C_REPLACE 0x0002 #define C_REPLACE_SETUP 0x0004 + + /* + * Internal cursor held for DB->get; don't hold locks unless involved + * in a TXN. + */ +#define C_INTERNAL 0x0008 u_int32_t flags; }; diff --git a/db2/include/btree_ext.h b/db2/include/btree_ext.h index dab0f5be4e..9133c58c6b 100644 --- a/db2/include/btree_ext.h +++ b/db2/include/btree_ext.h @@ -8,6 +8,7 @@ int __bam_pgin __P((db_pgno_t, void *, DBT *)); int __bam_pgout __P((db_pgno_t, void *, DBT *)); int __bam_mswap __P((PAGE *)); int __bam_cursor __P((DB *, DB_TXN *, DBC **)); +int __bam_c_iclose __P((DB *, DBC *)); int __bam_get __P((DB *, DB_TXN *, DBT *, DBT *, int)); int __bam_ovfl_chk __P((DB *, CURSOR *, u_int32_t, int)); int __bam_ca_delete __P((DB *, db_pgno_t, u_int32_t, CURSOR *)); @@ -51,6 +52,7 @@ int __bam_cdel_recover int __ram_open __P((DB *, DBTYPE, DB_INFO *)); int __ram_cursor __P((DB *, DB_TXN *, DBC **)); int __ram_close __P((DB *)); +int __ram_c_iclose __P((DB *, DBC *)); void __ram_ca __P((DB *, db_recno_t, ca_recno_arg)); int __ram_getno __P((DB *, const DBT *, db_recno_t *, int)); int __ram_snapshot __P((DB *)); diff --git a/db2/include/db.h.src b/db2/include/db.h.src index f9b29fa2af..63d9603dba 100644 --- a/db2/include/db.h.src +++ b/db2/include/db.h.src @@ -4,7 +4,7 @@ * Copyright (c) 1996, 1997 * Sleepycat Software. All rights reserved. * - * @(#)db.h.src 10.67 (Sleepycat) 8/25/97 + * @(#)db.h.src 10.77 (Sleepycat) 9/24/97 */ #ifndef _DB_H_ @@ -67,8 +67,8 @@ #define DB_VERSION_MAJOR 2 #define DB_VERSION_MINOR 3 -#define DB_VERSION_PATCH 4 -#define DB_VERSION_STRING "Sleepycat Software: DB 2.3.4: (8/20/97)" +#define DB_VERSION_PATCH 10 +#define DB_VERSION_STRING "Sleepycat Software: DB 2.3.10: (9/24/97)" typedef u_int32_t db_pgno_t; /* Page number type. */ typedef u_int16_t db_indx_t; /* Page offset type. */ @@ -329,6 +329,7 @@ struct __db_info { #define DB_NEEDSPLIT ( -9) /* Page needs to be split. */ #define DB_REGISTERED (-10) /* Entry was previously registered. */ #define DB_SWAPBYTES (-11) /* Database needs byte swapping. */ +#define DB_TXN_CKP (-12) /* Encountered ckp record in log. */ struct __db_ilock { /* Internal DB access method lock. */ db_pgno_t pgno; /* Page being locked. */ @@ -338,7 +339,7 @@ struct __db_ilock { /* Internal DB access method lock. */ /* DB access method description structure. */ struct __db { - void *mutex; /* Synchronization for free threading */ + void *mutexp; /* Synchronization for free threading */ DBTYPE type; /* DB access method. */ DB_ENV *dbenv; /* DB_ENV structure. */ DB_ENV *mp_dbenv; /* DB_ENV for local mpool creation. */ @@ -640,11 +641,11 @@ extern "C" { #endif int memp_close __P((DB_MPOOL *)); int memp_fclose __P((DB_MPOOLFILE *)); -int memp_fget __P((DB_MPOOLFILE *, db_pgno_t *, unsigned long, void *)); +int memp_fget __P((DB_MPOOLFILE *, db_pgno_t *, int, void *)); int memp_fopen __P((DB_MPOOL *, const char *, int, int, int, size_t, int, DBT *, u_int8_t *, DB_MPOOLFILE **)); -int memp_fput __P((DB_MPOOLFILE *, void *, unsigned long)); -int memp_fset __P((DB_MPOOLFILE *, void *, unsigned long)); +int memp_fput __P((DB_MPOOLFILE *, void *, int)); +int memp_fset __P((DB_MPOOLFILE *, void *, int)); int memp_fsync __P((DB_MPOOLFILE *)); int memp_open __P((const char *, int, int, DB_ENV *, DB_MPOOL **)); int memp_register __P((DB_MPOOL *, int, @@ -697,7 +698,7 @@ extern "C" { #endif int txn_abort __P((DB_TXN *)); int txn_begin __P((DB_TXNMGR *, DB_TXN *, DB_TXN **)); -int txn_checkpoint __P((const DB_TXNMGR *, long, long)); +int txn_checkpoint __P((const DB_TXNMGR *, int, int)); int txn_commit __P((DB_TXN *)); int txn_close __P((DB_TXNMGR *)); u_int32_t txn_id __P((DB_TXN *)); diff --git a/db2/include/db_185.h.src b/db2/include/db_185.h.src index 52fb3a0da1..3fbca8bfda 100644 --- a/db2/include/db_185.h.src +++ b/db2/include/db_185.h.src @@ -36,7 +36,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#)db_185.h.src 8.3 (Sleepycat) 7/27/97 + * @(#)db_185.h.src 8.4 (Sleepycat) 9/16/97 */ #ifndef _DB_185_H_ @@ -72,6 +72,14 @@ @u_int32_decl@ #endif +/* + * XXX + * SGI/IRIX already has a pgno_t. + */ +#ifdef sgi +#define pgno_t db_pgno_t +#endif + #define MAX_PAGE_NUMBER 0xffffffff /* >= # of pages in a file */ typedef u_int32_t pgno_t; #define MAX_PAGE_OFFSET 65535 /* >= # of bytes in a page */ diff --git a/db2/include/db_cxx.h b/db2/include/db_cxx.h index 506aed845c..611d967ef9 100644 --- a/db2/include/db_cxx.h +++ b/db2/include/db_cxx.h @@ -4,7 +4,7 @@ * Copyright (c) 1997 * Sleepycat Software. All rights reserved. * - * @(#)db_cxx.h 10.7 (Sleepycat) 8/22/97 + * @(#)db_cxx.h 10.8 (Sleepycat) 9/20/97 */ #ifndef _DB_CXX_H_ @@ -303,9 +303,9 @@ class _exported DbMpoolFile { public: int close(); - int get(db_pgno_t *pgnoaddr, unsigned long flags, void *pagep); - int put(void *pgaddr, unsigned long flags); - int set(void *pgaddr, unsigned long flags); + int get(db_pgno_t *pgnoaddr, int flags, void *pagep); + int put(void *pgaddr, int flags); + int set(void *pgaddr, int flags); int sync(); static int open(DbMpool *mp, const char *file, @@ -391,7 +391,7 @@ class _exported DbTxnMgr friend DbEnv; public: int begin(DbTxn *pid, DbTxn **tid); - int checkpoint(long kbyte, long min) const; + int checkpoint(int kbyte, int min) const; int close(); int stat(DB_TXN_STAT **statp, void *(*db_malloc)(size_t)); diff --git a/db2/include/db_ext.h b/db2/include/db_ext.h index 1cccb47617..b18b10ff7f 100644 --- a/db2/include/db_ext.h +++ b/db2/include/db_ext.h @@ -57,8 +57,8 @@ int __db_noop_print int __db_noop_read __P((void *, __db_noop_args **)); int __db_init_print __P((DB_ENV *)); int __db_init_recover __P((DB_ENV *)); -int __db_pgin __P((db_pgno_t, void *)); -int __db_pgout __P((db_pgno_t, void *)); +int __db_pgin __P((db_pgno_t, size_t, void *)); +int __db_pgout __P((db_pgno_t, size_t, void *)); int __db_dispatch __P((DB_LOG *, DBT *, DB_LSN *, int, void *)); int __db_add_recovery __P((DB_ENV *, int (*)(DB_LOG *, DBT *, DB_LSN *, int, void *), u_int32_t)); diff --git a/db2/include/db_int.h.src b/db2/include/db_int.h.src index b60e5002e5..ebadb35d36 100644 --- a/db2/include/db_int.h.src +++ b/db2/include/db_int.h.src @@ -4,7 +4,7 @@ * Copyright (c) 1996, 1997 * Sleepycat Software. All rights reserved. * - * @(#)db_int.h.src 10.28 (Sleepycat) 8/20/97 + * @(#)db_int.h.src 10.30 (Sleepycat) 9/23/97 */ #ifndef _DB_INTERNAL_H_ @@ -177,11 +177,11 @@ typedef struct _db_mutex_t { /* Lock/unlock a DB thread. */ #define DB_THREAD_LOCK(dbp) \ (F_ISSET(dbp, DB_AM_THREAD) ? \ - __db_mutex_lock((db_mutex_t *)(dbp)->mutex, -1, \ + __db_mutex_lock((db_mutex_t *)(dbp)->mutexp, -1, \ (dbp)->dbenv == NULL ? NULL : (dbp)->dbenv->db_yield) : 0) #define DB_THREAD_UNLOCK(dbp) \ (F_ISSET(dbp, DB_AM_THREAD) ? \ - __db_mutex_unlock((db_mutex_t *)(dbp)->mutex, -1) : 0) + __db_mutex_unlock((db_mutex_t *)(dbp)->mutexp, -1) : 0) /* Btree/recno local statistics structure. */ struct __db_bt_lstat; typedef struct __db_bt_lstat DB_BTREE_LSTAT; @@ -306,14 +306,6 @@ typedef struct __dbpginfo { * Transactions and recovery. *******************************************************/ /* - * The locker id space is divided between the transaction manager and the lock - * manager. Lockid's start at 0 and go to MAX_LOCKER_ID. Txn Id's start at - * MAX_LOCKER_ID + 1 and go up to MAX_TXNID. - */ -#define MAX_LOCKER_ID 0x0fffffff -#define MAX_TXNID 0xffffffff - -/* * Out of band value for a lock. The locks are returned to callers as offsets * into the lock regions. Since the RLAYOUT structure begins all regions, an * offset of 0 is guaranteed not to be a valid lock. diff --git a/db2/include/db_page.h b/db2/include/db_page.h index cde7ff9f2e..30f6072fc3 100644 --- a/db2/include/db_page.h +++ b/db2/include/db_page.h @@ -4,7 +4,7 @@ * Copyright (c) 1996, 1997 * Sleepycat Software. All rights reserved. * - * @(#)db_page.h 10.11 (Sleepycat) 9/3/97 + * @(#)db_page.h 10.13 (Sleepycat) 9/24/97 */ #ifndef _DB_PAGE_H_ @@ -273,6 +273,17 @@ typedef struct _db_page { #define H_OFFDUP 4 /* Overflow page of duplicates. */ /* + * !!! + * Items on hash pages are (potentially) unaligned, so we can never cast the + * (page + offset) pointer to an HKEYDATA, HOFFPAGE or HOFFDUP structure, as + * we do with B+tree on-page structures. Because we frequently want the type + * field, it requires no alignment, and it's in the same location in all three + * structures, there's a pair of macros. + */ +#define HPAGE_PTYPE(p) (*(u_int8_t *)p) +#define HPAGE_TYPE(pg, indx) (*P_ENTRY(pg, indx)) + +/* * The first and second types are H_KEYDATA and H_DUPLICATE, represented * by the HKEYDATA structure: * @@ -294,10 +305,7 @@ typedef struct _hkeydata { u_int8_t type; /* 00: Page type. */ u_int8_t data[1]; /* Variable length key/data item. */ } HKEYDATA; - -/* Get a HKEYDATA item for a specific index. */ -#define GET_HKEYDATA(pg, indx) \ - ((HKEYDATA *)P_ENTRY(pg, indx)) +#define HKEYDATA_DATA(p) (((u_int8_t *)p) + SSZA(HKEYDATA, data)) /* * The length of any HKEYDATA item. Note that indx is an element index, @@ -333,8 +341,8 @@ typedef struct _hkeydata { #define H_NUMPAIRS(pg) (NUM_ENT(pg) / 2) #define H_KEYINDEX(pindx) (2 * (pindx)) #define H_DATAINDEX(pindx) ((2 * (pindx)) + 1) -#define H_PAIRKEY(pg, pindx) GET_HKEYDATA(pg, H_KEYINDEX(pindx)) -#define H_PAIRDATA(pg, pindx) GET_HKEYDATA(pg, H_DATAINDEX(pindx)) +#define H_PAIRKEY(pg, pindx) P_ENTRY(pg, H_KEYINDEX(pindx)) +#define H_PAIRDATA(pg, pindx) P_ENTRY(pg, H_DATAINDEX(pindx)) #define H_PAIRSIZE(pg, psize, pindx) \ (LEN_HITEM(pg, psize, H_KEYINDEX(pindx)) + \ LEN_HITEM(pg, psize, H_DATAINDEX(pindx))) @@ -355,9 +363,8 @@ typedef struct _hoffpage { u_int32_t tlen; /* 08-11: Total length of item. */ } HOFFPAGE; -/* Get a HOFFPAGE item for a specific index. */ -#define GET_HOFFPAGE(pg, indx) \ - ((HOFFPAGE *)P_ENTRY(pg, indx)) +#define HOFFPAGE_PGNO(p) (((u_int8_t *)p) + SSZ(HOFFPAGE, pgno)) +#define HOFFPAGE_TLEN(p) (((u_int8_t *)p) + SSZ(HOFFPAGE, tlen)) /* * Page space required to add a new HOFFPAGE item to the page, with and @@ -378,10 +385,7 @@ typedef struct _hoffdup { u_int8_t unused[3]; /* 01-03: Padding, unused. */ db_pgno_t pgno; /* 04-07: Offpage page number. */ } HOFFDUP; - -/* Get a HOFFDUP item for a specific index. */ -#define GET_HOFFDUP(pg, indx) \ - ((HOFFDUP *)P_ENTRY(pg, indx)) +#define HOFFDUP_PGNO(p) (((u_int8_t *)p) + SSZ(HOFFDUP, pgno)) /* * Page space required to add a new HOFFDUP item to the page, with and diff --git a/db2/include/db_shash.h b/db2/include/db_shash.h index f695a2bafa..b94e0f1d41 100644 --- a/db2/include/db_shash.h +++ b/db2/include/db_shash.h @@ -4,14 +4,14 @@ * Copyright (c) 1996, 1997 * Sleepycat Software. All rights reserved. * - * @(#)db_shash.h 10.1 (Sleepycat) 4/12/97 + * @(#)db_shash.h 10.2 (Sleepycat) 9/16/97 */ /* Hash Headers */ typedef SH_TAILQ_HEAD(hash_head) DB_HASHTAB; /* - * __db_hashlookup -- + * HASHLOOKUP -- * * Look up something in a shared memory hash table. The "elt" argument * should be a key, and cmp_func must know how to compare a key to whatever @@ -30,7 +30,7 @@ typedef SH_TAILQ_HEAD(hash_head) DB_HASHTAB; * If the element is not in the hash table, this macro exits with result * set to NULL. */ -#define __db_hashlookup(begin, type, field, elt, r, n, hash, cmp) do { \ +#define HASHLOOKUP(begin, type, field, elt, r, n, hash, cmp) do { \ DB_HASHTAB *__bucket; \ u_int32_t __ndx; \ \ @@ -43,10 +43,10 @@ typedef SH_TAILQ_HEAD(hash_head) DB_HASHTAB; } while(0) /* - * __db_hashinsert -- + * HASHINSERT -- * * Insert a new entry into the hash table. This assumes that lookup has - * failed; don't call it if you haven't already called __db_hashlookup. + * failed; don't call it if you haven't already called HASHLOOKUP. * begin: the beginning address of the hash table. * type: the structure type of the elements that are linked in each bucket. * field: the name of the field by which the "type" structures are linked. @@ -54,7 +54,7 @@ typedef SH_TAILQ_HEAD(hash_head) DB_HASHTAB; * nelems: the number of buckets in the hash table. * hash_func: the hash function that operates on elements of the type of elt */ -#define __db_hashinsert(begin, type, field, elt, n, hash) do { \ +#define HASHINSERT(begin, type, field, elt, n, hash) do { \ u_int32_t __ndx; \ DB_HASHTAB *__bucket; \ \ @@ -64,7 +64,7 @@ typedef SH_TAILQ_HEAD(hash_head) DB_HASHTAB; } while(0) /* - * __db_hashremove -- + * HASHREMOVE -- * Remove the entry with a key == elt. * begin: address of the beginning of the hash table. * type: the structure type of the elements that are linked in each bucket. @@ -75,19 +75,19 @@ typedef SH_TAILQ_HEAD(hash_head) DB_HASHTAB; * cmp_func: compare elements of the type of elt with those in the table (of * type "type"). */ -#define __db_hashremove(begin, type, field, elt, n, hash, cmp) { \ +#define HASHREMOVE(begin, type, field, elt, n, hash, cmp) { \ u_int32_t __ndx; \ DB_HASHTAB *__bucket; \ SH_TAILQ_ENTRY *__entp; \ \ __ndx = hash(elt) % (n); \ __bucket = &begin[__ndx]; \ - __db_hashlookup(begin, type, field, elt, __entp, n, hash, cmp); \ + HASHLOOKUP(begin, type, field, elt, __entp, n, hash, cmp); \ SH_TAILQ_REMOVE(__bucket, __entp, field, type); \ } /* - * __db_hashremove_el -- + * HASHREMOVE_EL -- * Given the object "obj" in the table, remove it. * begin: address of the beginning of the hash table. * type: the structure type of the elements that are linked in each bucket. @@ -96,7 +96,7 @@ typedef SH_TAILQ_HEAD(hash_head) DB_HASHTAB; * nelems: the number of buckets in the hash table. * hash_func: the hash function that operates on elements of the type of elt */ -#define __db_hashremove_el(begin, type, field, obj, n, hash) { \ +#define HASHREMOVE_EL(begin, type, field, obj, n, hash) { \ u_int32_t __ndx; \ DB_HASHTAB *__bucket; \ \ diff --git a/db2/include/hash_ext.h b/db2/include/hash_ext.h index 5ae63dc6ad..32788c7b8a 100644 --- a/db2/include/hash_ext.h +++ b/db2/include/hash_ext.h @@ -1,6 +1,7 @@ /* Do not edit: automatically built by dist/distrib. */ int __ham_open __P((DB *, DB_INFO *)); int __ham_close __P((DB *)); +int __ham_c_iclose __P((DB *, DBC *)); int __ham_expand_table __P((HTAB *)); u_int32_t __ham_call_hash __P((HTAB *, u_int8_t *, int32_t)); int __ham_init_dbt __P((DBT *, u_int32_t, void **, u_int32_t *)); @@ -96,7 +97,7 @@ int __ham_dirty_page __P((HTAB *, PAGE *)); int __ham_get_page __P((DB *, db_pgno_t, PAGE **)); int __ham_overflow_page __P((DB *, u_int32_t, PAGE **)); #ifdef DEBUG -int bucket_to_page __P((HTAB *, int)); +int __bucket_to_page __P((HTAB *, int)); #endif void __ham_init_ovflpages __P((HTAB *)); int __ham_get_cpage __P((HTAB *, HASH_CURSOR *, db_lockmode_t)); diff --git a/db2/include/lock.h b/db2/include/lock.h index 18d29e8740..8f9e81c0fa 100644 --- a/db2/include/lock.h +++ b/db2/include/lock.h @@ -4,13 +4,19 @@ * Copyright (c) 1996, 1997 * Sleepycat Software. All rights reserved. * - * @(#)lock.h 10.7 (Sleepycat) 7/29/97 + * @(#)lock.h 10.8 (Sleepycat) 9/23/97 */ typedef struct __db_lockobj DB_LOCKOBJ; #define DB_DEFAULT_LOCK_FILE "__db_lock.share" #define DB_LOCK_DEFAULT_N 5000 + +/* + * The locker id space is divided between the transaction manager and the lock + * manager. Lockid's start at 0 and go to DB_LOCK_MAXID. Txn Id's start at + * DB_LOCK_MAXID + 1 and go up to TXN_INVALID. + */ #define DB_LOCK_MAXID 0x7fffffff /* diff --git a/db2/include/log.h b/db2/include/log.h index 970dfd153a..a9c82fa04d 100644 --- a/db2/include/log.h +++ b/db2/include/log.h @@ -4,7 +4,7 @@ * Copyright (c) 1996, 1997 * Sleepycat Software. All rights reserved. * - * @(#)log.h 10.8 (Sleepycat) 8/18/97 + * @(#)log.h 10.9 (Sleepycat) 9/23/97 */ #ifndef _LOG_H_ @@ -30,11 +30,11 @@ struct __log_persist; typedef struct __log_persist LOGP; /* Macros to lock/unlock the region and threads. */ #define LOCK_LOGTHREAD(dblp) \ if (F_ISSET(dblp, DB_AM_THREAD)) \ - (void)__db_mutex_lock(&(dblp)->mutex, -1, \ + (void)__db_mutex_lock((dblp)->mutexp, -1, \ (dblp)->dbenv == NULL ? NULL : (dblp)->dbenv->db_yield) #define UNLOCK_LOGTHREAD(dblp) \ if (F_ISSET(dblp, DB_AM_THREAD)) \ - (void)__db_mutex_unlock(&(dblp)->mutex, -1); + (void)__db_mutex_unlock((dblp)->mutexp, -1); #define LOCK_LOGREGION(dblp) \ (void)__db_mutex_lock(&((RLAYOUT *)(dblp)->lp)->lock, \ (dblp)->fd, (dblp)->dbenv == NULL ? NULL : (dblp)->dbenv->db_yield) @@ -56,7 +56,7 @@ typedef struct __db_entry { */ struct __db_log { /* These fields need to be protected for multi-threaded support. */ - db_mutex_t mutex; /* Mutex for thread protection. */ + db_mutex_t *mutexp; /* Mutex for thread protection. */ DB_ENTRY *dbentry; /* Recovery file-id mapping. */ #define DB_GROW_SIZE 64 @@ -86,6 +86,8 @@ struct __db_log { void *addr; /* Address of shalloc() region. */ int fd; /* Region file descriptor. */ + char *dir; /* Directory argument. */ + u_int32_t flags; /* Support the DB_AM_XXX flags. */ }; diff --git a/db2/include/log_ext.h b/db2/include/log_ext.h index d5c9dd6e72..bc63d9dac8 100644 --- a/db2/include/log_ext.h +++ b/db2/include/log_ext.h @@ -1,6 +1,6 @@ /* Do not edit: automatically built by dist/distrib. */ -int __log_find __P((DB_ENV *, LOG *, int *)); -int __log_valid __P((DB_ENV *, LOG *, int)); +int __log_find __P((DB_LOG *, int *)); +int __log_valid __P((DB_LOG *, LOG *, int)); int __log_register_log __P((DB_LOG *, DB_TXN *, DB_LSN *, u_int32_t, DBT *, DBT *, u_int32_t, DBTYPE)); @@ -18,7 +18,7 @@ int __log_init_recover __P((DB_ENV *)); int __log_findckp __P((DB_LOG *, DB_LSN *)); int __log_get __P((DB_LOG *, DB_LSN *, DBT *, int, int)); int __log_put __P((DB_LOG *, DB_LSN *, const DBT *, int)); -int __log_name __P((DB_ENV *, int, char **)); +int __log_name __P((DB_LOG *, int, char **)); int __log_register_recover __P((DB_LOG *, DBT *, DB_LSN *, int, void *)); int __log_unregister_recover diff --git a/db2/include/mp.h b/db2/include/mp.h index 1fe0c752a9..3b71774484 100644 --- a/db2/include/mp.h +++ b/db2/include/mp.h @@ -4,7 +4,7 @@ * Copyright (c) 1996, 1997 * Sleepycat Software. All rights reserved. * - * @(#)mp.h 10.15 (Sleepycat) 8/29/97 + * @(#)mp.h 10.16 (Sleepycat) 9/23/97 */ struct __bh; typedef struct __bh BH; @@ -99,7 +99,7 @@ struct __mpoolfile; typedef struct __mpoolfile MPOOLFILE; */ struct __db_mpool { /* These fields need to be protected for multi-threaded support. */ - db_mutex_t mutex; /* Structure lock. */ + db_mutex_t *mutexp; /* Structure lock. */ /* List of pgin/pgout routines. */ LIST_HEAD(__db_mpregh, __db_mpreg) dbregq; @@ -145,7 +145,7 @@ struct __db_mpreg { */ struct __db_mpoolfile { /* These fields need to be protected for multi-threaded support. */ - db_mutex_t mutex; /* Structure lock. */ + db_mutex_t *mutexp; /* Structure lock. */ int fd; /* Underlying file descriptor. */ diff --git a/db2/include/shqueue.h b/db2/include/shqueue.h index c3e2f4aecc..c596d33e92 100644 --- a/db2/include/shqueue.h +++ b/db2/include/shqueue.h @@ -1,38 +1,11 @@ -/* - * 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. +/*- + * See the file LICENSE for redistribution information. * - * 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. + * Copyright (c) 1996, 1997 + * Sleepycat Software. All rights reserved. * - * @(#)shqueue.h 8.11 (Sleepycat) 7/27/97 + * @(#)shqueue.h 8.12 (Sleepycat) 9/10/97 */ - #ifndef _SYS_SHQUEUE_H_ #define _SYS_SHQUEUE_H_ diff --git a/db2/include/txn.h b/db2/include/txn.h index f4e0999b36..8bb3976c1c 100644 --- a/db2/include/txn.h +++ b/db2/include/txn.h @@ -4,7 +4,7 @@ * Copyright (c) 1996, 1997 * Sleepycat Software. All rights reserved. * - * @(#)txn.h 10.6 (Sleepycat) 7/29/97 + * @(#)txn.h 10.10 (Sleepycat) 9/23/97 */ #ifndef _TXN_H_ #define _TXN_H_ @@ -14,8 +14,9 @@ * the region is always created group RW of the group owning the directory. */ #define DEFAULT_TXN_FILE "__db_txn.share" +/* TXN_MINIMUM = (DB_LOCK_MAXID + 1) but this makes compilers complain. */ +#define TXN_MINIMUM 0x80000000 #define TXN_INVALID 0xffffffff /* Maximum number of txn ids. */ -#define TXN_MINIMUM 0x80000000 /* First transaction id */ /* * Transaction type declarations. @@ -36,6 +37,7 @@ typedef struct __txn_detail { #define TXN_ABORTED 2 #define TXN_PREPARED 3 u_int32_t status; /* status of the transaction */ + SH_TAILQ_ENTRY links; /* free/active list */ } TXN_DETAIL; /* @@ -45,7 +47,7 @@ typedef struct __txn_detail { */ struct __db_txnmgr { /* These fields need to be protected for multi-threaded support. */ - db_mutex_t mutex; /* Synchronization. */ + db_mutex_t *mutexp; /* Synchronization. */ /* list of active transactions */ TAILQ_HEAD(_chain, __db_txn) txn_chain; @@ -57,11 +59,14 @@ struct __db_txnmgr { u_int flags; /* DB_TXN_NOSYNC, DB_THREAD */ size_t reg_size; /* how large we think the region is */ DB_TXNREGION *region; /* address of shared memory region */ + void *mem; /* address of the shalloc space */ }; /* * Layout of the shared memory region. - * + * The region consists of a DB_TXNREGION structure followed by a large + * pool of shalloc'd memory which is used to hold TXN_DETAIL structures + * and thread mutexes (which are dynamically allocated). */ struct __db_txnregion { RLAYOUT hdr; /* Shared memory region header. */ @@ -69,7 +74,6 @@ struct __db_txnregion { u_int32_t version; /* version number */ u_int32_t maxtxns; /* maximum number of active txns */ u_int32_t last_txnid; /* last transaction id given out */ - u_int32_t free_txn; /* head of transaction free list */ DB_LSN pending_ckp; /* last checkpoint did not finish */ DB_LSN last_ckp; /* lsn of the last checkpoint */ time_t time_ckp; /* time of last checkpoint */ @@ -78,20 +82,25 @@ struct __db_txnregion { u_int32_t naborts; /* number of aborted transactions */ u_int32_t ncommits; /* number of committed transactions */ u_int32_t nbegins; /* number of begun transactions */ - TXN_DETAIL table[1]; /* array of TXN structures */ + SH_TAILQ_HEAD(_active) active_txn; /* active transaction list */ }; +/* + * Make the region large enough to hold N transaction detail structures + * plus some space to hold thread handles and the beginning of the shalloc + * region. + */ #define TXN_REGION_SIZE(N) \ - (sizeof(DB_TXNREGION) + N * sizeof(DB_TXN)) + (sizeof(DB_TXNREGION) + N * sizeof(TXN_DETAIL) + 1000) /* Macros to lock/unlock the region and threads. */ #define LOCK_TXNTHREAD(tmgrp) \ if (F_ISSET(tmgrp, DB_THREAD)) \ - (void)__db_mutex_lock(&(tmgrp)->mutex, -1, \ + (void)__db_mutex_lock((tmgrp)->mutexp, -1, \ (tmgrp)->dbenv == NULL ? NULL : (tmgrp)->dbenv->db_yield) #define UNLOCK_TXNTHREAD(tmgrp) \ if (F_ISSET(tmgrp, DB_THREAD)) \ - (void)__db_mutex_unlock(&(tmgrp)->mutex, -1) + (void)__db_mutex_unlock((tmgrp)->mutexp, -1) #define LOCK_TXNREGION(tmgrp) \ (void)__db_mutex_lock(&(tmgrp)->region->hdr.lock,(tmgrp)->fd, \ |