diff options
author | Ulrich Drepper <drepper@redhat.com> | 1997-09-05 01:43:20 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 1997-09-05 01:43:20 +0000 |
commit | 26b4d7667169f8db26fd8194b3c498ec58e50f90 (patch) | |
tree | 491a6edd9fe8961fe781a50c39517dae8a35321d /db2/include | |
parent | 800d775e426b9c0af63f711b79b09bf540c97456 (diff) | |
download | glibc-26b4d7667169f8db26fd8194b3c498ec58e50f90.tar glibc-26b4d7667169f8db26fd8194b3c498ec58e50f90.tar.gz glibc-26b4d7667169f8db26fd8194b3c498ec58e50f90.tar.bz2 glibc-26b4d7667169f8db26fd8194b3c498ec58e50f90.zip |
Update.cvs/libc-ud-970904
1997-09-05 03:15 Ulrich Drepper <drepper@cygnus.com>
* Makefile (subdirs): Reorganize order so that nss follows add-ons.
* config.make.in (LDAP): Add.
* configure.in: Prepare for ldap add-on.
* shlib-versions: Add version numbers for ldap NSS module.
* nss/Makefile: Add rules to build ldap NSS module.
* db/btree/bt_page.c (__bt_free): Update meta data information.
Update db from db-2.3.6.
* db2/db.h: Updated.
* db2/btree/bt_close.c: Updated.
* db2/btree/bt_compare.c: Updated.
* db2/btree/bt_conv.c: Updated.
* db2/btree/bt_cursor.c: Updated.
* db2/btree/bt_delete.c: Updated.
* db2/btree/bt_put.c: Updated.
* db2/btree/bt_rec.c: Updated.
* db2/btree/bt_recno.c: Updated.
* db2/btree/bt_search.c: Updated.
* db2/btree/bt_split.c: Updated.
* db2/btree/bt_stat.c: Updated.
* db2/common/db_appinit.c: Updated.
* db2/common/db_apprec.c: Updated.
* db2/common/db_byteorder.c: Updated.
* db2/common/db_err.c: Updated.
* db2/common/db_region.c: Updated.
* db2/db/db.c: Updated.
* db2/db/db_conv.c: Updated.
* db2/db/db_dup.c: Updated.
* db2/db/db_pr.c: Updated.
* db2/db/db_ret.c: Updated.
* db2/db185/db185.c: Updated.
* db2/dbm/dbm.c: Updated.
* db2/hash/hash_dup.c: Updated.
* db2/include/db_am.h: Updated.
* db2/include/db_page.h: Updated.
* db2/include/mp.h: Updated.
* db2/include/queue.h: Updated.
* db2/log/log.c: Updated.
* db2/log/log_findckp.c: Updated.
* db2/log/log_get.c: Updated.
* db2/log/log_rec.c: Updated.
* db2/mp/mp_bh.c: Updated.
* db2/mp/mp_fopen.c: Updated.
* db2/mp/mp_pr.c: Updated.
* db2/mp/mp_sync.c: Updated.
* db2/mutex/x86.gcc: Updated.
* db2/os/db_os_dir.c: Updated.
* db2/os/db_os_fid.c: Updated.
* db2/progs/db_archive/db_archive.c: Updated.
* db2/progs/db_checkpoint/db_checkpoint.c: Updated.
* db2/progs/db_deadlock/db_deadlock.c: Updated.
* db2/progs/db_dump/db_dump.c: Updated.
* db2/progs/db_dump185/db_dump185.c: Updated.
* db2/progs/db_load/db_load.c: Updated.
* db2/progs/db_printlog/db_printlog.c: Updated.
* db2/progs/db_recover/db_recover.c: Updated.
* db2/progs/db_stat/db_stat.c: Updated.
* db2/txn/txn.c: Updated.
* db2/txn/txn_rec.c: Updated.
* db2/Makefile: Add rule to build db_printlog.
* db2/config.h: Don't include endian.h and don't define
WORDS_BIGENDIAN. Only define HAVE_ENDIAN_H.
* elf/dl-open.c (_dl_open): Make thread-safe.
* elf/dl-close.c (_dl_close): Likewise.
* elf/dlclose.c: Pretty print.
* elf/dl-version.c (make_string): Use __strdup not strdup.
(find_needed): Don't use l_searchlist of _dl_loaded, use the
l_next list.
* elf/dl-deps.c (_dl_map_object_deps): Remove variable head.
* manual/math.texi: Add note about == and != for FP values.
* manual/message.texi: Mention problems with relative paths and
binstextdomain.
* manual/string.texi: Mark strdupa and strndupa correctly as macros.
* sunrpc/Makefile (CFLAGS-xkey_prot.c): Define to prevent warnings.
* sunrpc/rpc_cout.c: Avoid needless races around return value.
* sysdeps/generic/stpcpy.c: Include <config.h> if wanted.
Update from tzdata-1997h.
* time/africa: Updated.
* time/europe: Updated.
* time/iso3166.tab: Updated.
* time/northamerica: Updated.
* time/southamerica: Updated.
* time/zone.tab: Updated.
1997-09-04 13:19 Richard Henderson <rth@cygnus.com>
* sysdeps/alpha/w_sqrt.S: Removed.
* sysdeps/alpha/fpu/e_sqrt.c: New. Obey -mieee and -mieee-with-inexact
and build a version that is as fast as possible given the constraint.
1997-08-30 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* manual/maint.texi: Document some defaults for configuration
parameters.
1997-09-04 15:57 Ulrich Drepper <drepper@cygnus.com>
* termios/cfsetspeed.c (cfsetspeed): Change return value to int.
* termios/termios.h: Change prototype accordingly.
Reported by Andreas Jaeger <aj@arthur.rhein-neckar.de>.
1997-07-26 14:42 H.J. Lu <hjl@gnu.ai.mit.edu>
* libio/stdfiles.c (_libio_using_thunks): Define if
_G_USING_THUNKS is defined.
* libio/_G_config.h: Moved to ...
* sysdeps/generic/_G_config.h: ...here.
* sysdeps/unix/sysv/linux/_G_config.h: New,
Add vtable thunks support.
1997-09-02 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/m68k/Makefile (pic-ccflag): Override it for more
efficient code (together with a change in gcc).
* Makeconfig (pic-ccflag): New variable.
(CFLAGS-.os): Use it instead of hardcoding -fPIC.
1997-09-02 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/m68k/dl-machine.h (elf_machine_load_address): Use
_dl_start instead of a local label, to avoid getting an unreadable
label name.
1997-09-02 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* nss/Makefile ($(objpfx)libnss_db.so): Use $(dbobjdir) to find
libdb.so.
* Makeconfig (dbobjdir): Use db2.
1997-08-31 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* manual/maint.texi (Porting to Unix): Update description of the
implementation of Unix system calls.
(Contributors): Use real umlaut in tege's name.
1997-08-30 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/libm-ieee754/w_gamma.c: Make compilable with
_IEEE_LIBM.
* sysdeps/libm-ieee754/w_gammaf.c: Likewise.
* sysdeps/libm-ieee754/w_gammal.c: Likewise.
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; }; |