diff options
Diffstat (limited to 'db2/include')
| -rw-r--r-- | db2/include/db_am.h | 4 | ||||
| -rw-r--r-- | db2/include/db_page.h | 31 | ||||
| -rw-r--r-- | db2/include/mp.h | 11 |
3 files changed, 32 insertions, 14 deletions
diff --git a/db2/include/db_am.h b/db2/include/db_am.h index 3289eececa..5814ff88c3 100644 --- a/db2/include/db_am.h +++ b/db2/include/db_am.h @@ -4,7 +4,7 @@ * Copyright (c) 1996, 1997 * Sleepycat Software. All rights reserved. * - * @(#)db_am.h 10.5 (Sleepycat) 8/22/97 + * @(#)db_am.h 10.6 (Sleepycat) 8/27/97 */ #ifndef _DB_AM_H #define _DB_AM_H @@ -30,7 +30,7 @@ file_dbp = mdbp = NULL; \ if ((ret = func(dbtp->data, &argp)) != 0) \ goto out; \ - if (__db_fileid_to_db(logp, &mdbp, argp->fileid)) { \ + if ((ret = __db_fileid_to_db(logp, &mdbp, argp->fileid)) != 0) {\ if (ret == DB_DELETED) \ ret = 0; \ goto out; \ diff --git a/db2/include/db_page.h b/db2/include/db_page.h index 9e78682c57..cde7ff9f2e 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.10 (Sleepycat) 8/18/97 + * @(#)db_page.h 10.11 (Sleepycat) 9/3/97 */ #ifndef _DB_PAGE_H_ @@ -400,6 +400,24 @@ typedef struct _hoffdup { #define B_OVERFLOW 3 /* Overflow key/data item. */ /* + * We have to store a deleted entry flag in the page. The reason is complex, + * but the simple version is that we can't delete on-page items referenced by + * a cursor -- the return order of subsequent insertions might be wrong. The + * delete flag is an overload of the top bit of the type byte. + */ +#define B_DELETE (0x80) +#define B_DCLR(t) (t) &= ~B_DELETE +#define B_DSET(t) (t) |= B_DELETE +#define B_DISSET(t) ((t) & B_DELETE) + +#define B_TYPE(t) ((t) & ~B_DELETE) +#define B_TSET(t, type, deleted) { \ + (t) = (type); \ + if (deleted) \ + B_DSET(t); \ +} + +/* * The first type is B_KEYDATA, represented by the BKEYDATA structure: * * +-----------------------------------+ @@ -408,8 +426,7 @@ typedef struct _hoffdup { */ typedef struct _bkeydata { db_indx_t len; /* 00-01: Key/data item length. */ - u_int deleted :1; /* 02: Page type and delete flag. */ - u_int type :7; + u_int8_t type; /* 02: Page type AND DELETE FLAG. */ u_int8_t data[1]; /* Variable length key/data item. */ } BKEYDATA; @@ -438,8 +455,7 @@ typedef struct _bkeydata { */ typedef struct _boverflow { db_indx_t unused1; /* 00-01: Padding, unused. */ - u_int deleted :1; /* 02: Page type and delete flag. */ - u_int type :7; + u_int8_t type; /* 02: Page type AND DELETE FLAG. */ u_int8_t unused2; /* 03: Padding, unused. */ db_pgno_t pgno; /* 04-07: Next page number. */ u_int32_t tlen; /* 08-11: Total length of item. */ @@ -479,9 +495,8 @@ typedef struct _boverflow { * +-----------------------------------+ */ typedef struct _binternal { - db_indx_t len; /* 00-01: Key/data item length. */ - u_int deleted :1; /* 02: Page type and delete flag. */ - u_int type :7; + db_indx_t len; /* 00-01: Key/data item length. */ + u_int8_t type; /* 02: Page type AND DELETE FLAG. */ u_int8_t unused; /* 03: Padding, unused. */ db_pgno_t pgno; /* 04-07: Page number of referenced page. */ db_recno_t nrecs; /* 08-11: Subtree record count. */ diff --git a/db2/include/mp.h b/db2/include/mp.h index 4872596f83..1fe0c752a9 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.14 (Sleepycat) 8/18/97 + * @(#)mp.h 10.15 (Sleepycat) 8/29/97 */ struct __bh; typedef struct __bh BH; @@ -161,9 +161,12 @@ struct __db_mpoolfile { void *addr; /* Address of mmap'd region. */ size_t len; /* Length of mmap'd region. */ -#define MP_PATH_ALLOC 0x01 /* Path is allocated memory. */ -#define MP_PATH_TEMP 0x02 /* Backing file is a temporary. */ -#define MP_READONLY 0x04 /* File is readonly. */ +/* These fields need to be protected for multi-threaded support. */ +#define MP_PATH_ALLOC 0x001 /* Path is allocated memory. */ +#define MP_PATH_TEMP 0x002 /* Backing file is a temporary. */ +#define MP_READONLY 0x004 /* File is readonly. */ +#define MP_UPGRADE 0x008 /* File descriptor is readwrite. */ +#define MP_UPGRADE_FAIL 0x010 /* Upgrade wasn't possible. */ u_int32_t flags; }; |