From af69217fea009d28a9dca78796147a05d3cffb01 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sun, 25 Jan 1998 17:01:47 +0000 Subject: Update. 1998-01-26 00:57 Ulrich Drepper * db2/Makefile (routines): Add os_alloc. * db2/db.h: Update from db-2.3.16. * db2/db_185.h: Likewise. * db2/db_int.h: Likewise. * db2/btree/bt_close.c: Likewise. * db2/btree/bt_cursor.c: Likewise. * db2/btree/bt_delete.c: Likewise. * db2/btree/bt_open.c: Likewise. * db2/btree/bt_page.c: Likewise. * db2/btree/bt_put.c: Likewise. * db2/btree/bt_rec.c: Likewise. * db2/btree/bt_recno.c: Likewise. * db2/btree/btree_auto.c: Likewise. * db2/common/db_appinit.c: Likewise. * db2/common/db_apprec.c: Likewise. * db2/common/db_err.c: Likewise. * db2/common/db_region.c: Likewise. * db2/common/db_shash.c: Likewise. * db2/db/db.c: Likewise. * db2/db/db_auto.c: Likewise. * db2/db/db_conv.c: Likewise. * db2/db/db_dispatch.c: Likewise. * db2/db/db_dup.c: Likewise. * db2/db/db_pr.c: Likewise. * db2/db/db_rec.c: Likewise. * db2/db185/db185.c: Likewise. * db2/dbm/dbm.c: Likewise. * db2/hash/hash.c: Likewise. * db2/hash/hash_auto.c: Likewise. * db2/hash/hash_dup.c: Likewise. * db2/hash/hash_page.c: Likewise. * db2/hash/hash_rec.c: Likewise. * db2/include/btree_ext.h: Likewise. * db2/include/clib_ext.h: Likewise. * db2/include/common_ext.h: Likewise. * db2/include/db.h.src: Likewise. * db2/include/db_185.h.src: Likewise. * db2/include/db_am.h: Likewise. * db2/include/db_ext.h: Likewise. * db2/include/db_int.h.src: Likewise. * db2/include/hash_ext.h: Likewise. * db2/include/lock_ext.h: Likewise. * db2/include/log.h: Likewise. * db2/include/log_auto.h: Likewise. * db2/include/log_ext.h: Likewise. * db2/include/mp.h: Likewise. * db2/include/mp_ext.h: Likewise. * db2/include/mutex_ext.h: Likewise. * db2/include/os_ext.h: Likewise. * db2/include/os_func.h: Likewise. * db2/include/txn_ext.h: Likewise. * db2/lock/lock.c: Likewise. * db2/lock/lock_util.c: Likewise. * db2/log/log.c: Likewise. * db2/log/log.src: Likewise. * db2/log/log_archive.c: Likewise. * db2/log/log_auto.c: Likewise. * db2/log/log_get.c: Likewise. * db2/log/log_put.c: Likewise. * db2/log/log_rec.c: Likewise. * db2/log/log_register.c: Likewise. * db2/mp/mp_bh.c: Likewise. * db2/mp/mp_fget.c: Likewise. * db2/mp/mp_fopen.c: Likewise. * db2/mp/mp_fput.c: Likewise. * db2/mp/mp_pr.c: Likewise. * db2/mp/mp_sync.c: Likewise. * db2/mutex/mutex.c: Likewise. * db2/os/os_alloc.c: Likewise. * db2/os/os_config.c: Likewise. * db2/os/os_stat.c: Likewise. * db2/progs/db_checkpoint/db_checkpoint.c: Likewise. * db2/progs/db_deadlock/db_deadlock.c: Likewise. * db2/progs/db_load/db_load.c: Likewise. * db2/progs/db_printlog/db_printlog.c: Likewise. * db2/progs/db_recover/db_recover.c: Likewise. * db2/progs/db_stat/db_stat.c: Likewise. * db2/txn/txn.c: Likewise. * elf/dl-close.c (_dl_close): Rename inner variable named map to imap. Unmap memory blocks in reverse order of allocation. Call munmap with load address added to offset. Bug reported by Miguel de Icaza. * locale/programs/ld-collate.c (collate_end_weight): Correctly fill up weight array. * localedata/locales/cs_CZ: Update by Michael Mraka . * misc/sys/syslog.h: Reformat a bit. Don't declare vsyslog unless __USE_BSD. * nis/nss_compat/compat-grp.c: Correctly handle buffer overflow while reading line with fgets. * nis/nss_compat/compat-pwd.c: Likewise. * nis/nss_compat/compat-spwd.c: Likewise. * nss/nss_files/files-XXX.c: Likewise. * nss/nss_files/files-alias.c: Likewise. * shadow/fgetspent_r.c: Likewise. * string/strerror_r.c: Correct comment. Patch by Andreas Jaeger. * sysdeps/unix/sysv/linux/bits/stat.h: Define _STATBUF_ST_RDEV. * sysdeps/unix/sysv/linux/alpha/bits/stat.h: Likewise. * sysdeps/unix/sysv/linux/mips/bits/stat.h: Likewise. * sysdeps/unix/sysv/linux/i386/sys/ucontext.h: Allocate room for FP register content in ucontext_t. 1998-01-22 Andreas Jaeger * sysdeps/libm-ieee754/s_modfl.c (modf): Correct calculation. Patch by Markus Schoder . * math/libm-test.c (modf_test): Add more tests for modf. * sysdeps/unix/sysv/linux/sys/mman.h: Add const to mlock and munlock according to Unix98. 1998-01-25 Andreas Jaeger * nss/nss_files/files-network.c (LINE_PARSER): Set n_addrtype to AF_INET. 1998-01-21 07:22 H.J. Lu * sysdeps/posix/ttyname.c: Handle symbolic links. * sysdeps/posix/ttyname_r.c: Ditto. 1998-01-25 19:39 Ulrich Drepper * db2/makedb.c (process_input): Write terminating \0 for value. (print_database): Simply print value string, don't use length. 1998-01-24 Andreas Jaeger * nss/nsswitch.c (__nss_configure_lookup): Correct test for early exit of loop. 1998-01-25 Thorsten Kukuk * nis/ypclnt.c: Don't set dom_client to NULL, or we will not close all sockets. 1998-01-25 14:54 Ulrich Drepper * signal/Makefile (routines): Add sighold, sigrelse, sigignore, and sigset. * signal/sighold.c: New file. * signal/sigrelse.c: New file. * sysdeps/generic/sigignore.c: New file. * sysdeps/generic/sigset.c: New file. * sysdeps/posix/sigignore.c: New file. * sysdeps/posix/sigset.c: New file. * signal/signal.h: Add prototypes for new functions. * sysdeps/unix/sysv/linux/alpha/bits/signum.h: Define SIG_HOLD. * sysdeps/unix/sysv/linux/bits/signum.h: Likewise. * sysdeps/unix/sysv/linux/mips/bits/signum.h: Likewise. * sysdeps/unix/sysv/linux/sparc/bits/signum.h: Likewise. 1998-01-23 00:16 Tim Waugh * posix/wordexp.c: Added IFS field-splitting in parameter and command substitution. Fixed an IFS-related bug that caused an infinite loop. 1998-01-25 12:38 Ulrich Drepper * stdlib/Makefile (routines): Add getcontext, setcontext, makecontext, and swapcontext. * stdlib/ucontext.h: Correct prototypes. * sysdeps/generic/getcontext.c: New file. * sysdeps/generic/setcontext.c: New file. * sysdeps/generic/makecontext.c: New file. * sysdeps/generic/swapcontext.c: New file. * sysdeps/unix/sysv/linux/sparc/sparc64/Makefile: Removed. 1998-01-25 04:07 Ulrich Drepper * resource/sys/resource.h: Remove #include of ulimit.h which is not allowed by SUSv2 and not available on other systems. * sysdeps/unix/sysv/linux/ulimit.c: Include ulimit.h. * streams/Makefile: New file. * streams/stropts.h: New file. * sysdeps/generic/bits/stropts.h: New file. * sysdeps/generic/isastream.c: New file. * sysdeps/generic/getmsg.c: New file. * sysdeps/generic/getpmsg.c: New file. * sysdeps/generic/putmsg.c: New file. * sysdeps/generic/putpmsg.c: New file. * sysdeps/generic/fattach.c: New file. * sysdeps/generic/fdetach.c: New file. * sysdeps/unix/inet/Subdirs: Add streams. * sysdeps/generic/bits/types.h: Add definition of __t_scalar_t and __t_uscalar_t. * sysdeps/unix/sysv/linux/bits/types.h: Likewise. * sysdeps/unix/sysv/linux/alpha/bits/types.h: Likewise. * sysdeps/unix/sysv/linux/mips/bits/types.h: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc64/bits/types.h: Likewise. * sysdeps/mach/_strerror.c: Follow changes of generic version to handle small buffers correctly. 1998-01-24 17:31 H.J. Lu * sysdeps/alpha/dl-machine.h (ELF_MACHINE_RUNTIME_TRAMPOLINE): Remove the 3rd arg and add declaration for _dl_runtime_resolve and _dl_runtime_profile. 1998-01-25 02:42 Ulrich Drepper * include/cpio.h: New file. Mainly copied from GNU cpio. * posix/Makefile (headers): Add cpio.h. --- db2/db/db.c | 18 +++++++++--------- db2/db/db_auto.c | 22 +++++++++++----------- db2/db/db_conv.c | 6 ++++-- db2/db/db_dispatch.c | 11 ++++++++--- db2/db/db_dup.c | 7 +++---- db2/db/db_pr.c | 4 ++-- db2/db/db_rec.c | 12 +++++++++--- 7 files changed, 46 insertions(+), 34 deletions(-) (limited to 'db2/db') diff --git a/db2/db/db.c b/db2/db/db.c index 50b14eba7c..8df76349d1 100644 --- a/db2/db/db.c +++ b/db2/db/db.c @@ -44,7 +44,7 @@ #include "config.h" #ifndef lint -static const char sccsid[] = "@(#)db.c 10.44 (Sleepycat) 10/25/97"; +static const char sccsid[] = "@(#)db.c 10.45 (Sleepycat) 12/4/97"; #endif /* not lint */ #ifndef NO_SYSTEM_INCLUDES @@ -110,9 +110,9 @@ db_open(fname, type, flags, mode, dbenv, dbinfo, dbpp) DB_ENV *envp, t_dbenv; DB_PGINFO pginfo; HASHHDR *hashm; - off_t io; size_t cachesize; ssize_t nr; + u_int32_t iopsize; int fd, ftype, need_fileid, restore, ret, retry_cnt, swapped; char *real_name, mbuf[512]; @@ -269,17 +269,17 @@ open_retry: if (LF_ISSET(DB_CREATE)) { * sizes, we limit the default pagesize to 16K. */ if (dbp->pgsize == 0) { - if ((ret = - __db_ioinfo(real_name, fd, NULL, &io)) != 0) { + if ((ret = __db_ioinfo(real_name, + fd, NULL, NULL, &iopsize)) != 0) { __db_err(dbenv, "%s: %s", real_name, strerror(ret)); goto err; } - if (io < 512) - io = 512; - if (io > 16 * 1024) - io = 16 * 1024; - dbp->pgsize = io; + if (iopsize < 512) + iopsize = 512; + if (iopsize > 16 * 1024) + iopsize = 16 * 1024; + dbp->pgsize = iopsize; F_SET(dbp, DB_AM_PGDEF); } diff --git a/db2/db/db_auto.c b/db2/db/db_auto.c index 88bca7b583..5d35264103 100644 --- a/db2/db/db_auto.c +++ b/db2/db/db_auto.c @@ -20,7 +20,7 @@ * PUBLIC: int __db_addrem_log * PUBLIC: __P((DB_LOG *, DB_TXN *, DB_LSN *, u_int32_t, * PUBLIC: u_int32_t, u_int32_t, db_pgno_t, u_int32_t, - * PUBLIC: size_t, DBT *, DBT *, DB_LSN *)); + * PUBLIC: size_t, const DBT *, const DBT *, DB_LSN *)); */ int __db_addrem_log(logp, txnid, ret_lsnp, flags, opcode, fileid, pgno, indx, nbytes, hdr, @@ -34,8 +34,8 @@ int __db_addrem_log(logp, txnid, ret_lsnp, flags, db_pgno_t pgno; u_int32_t indx; size_t nbytes; - DBT *hdr; - DBT *dbt; + const DBT *hdr; + const DBT *dbt; DB_LSN * pagelsn; { DBT logrec; @@ -229,7 +229,7 @@ __db_addrem_read(recbuf, argpp) /* * PUBLIC: int __db_split_log * PUBLIC: __P((DB_LOG *, DB_TXN *, DB_LSN *, u_int32_t, - * PUBLIC: u_int32_t, u_int32_t, db_pgno_t, DBT *, + * PUBLIC: u_int32_t, u_int32_t, db_pgno_t, const DBT *, * PUBLIC: DB_LSN *)); */ int __db_split_log(logp, txnid, ret_lsnp, flags, @@ -241,7 +241,7 @@ int __db_split_log(logp, txnid, ret_lsnp, flags, u_int32_t opcode; u_int32_t fileid; db_pgno_t pgno; - DBT *pageimage; + const DBT *pageimage; DB_LSN * pagelsn; { DBT logrec; @@ -400,7 +400,7 @@ __db_split_read(recbuf, argpp) * PUBLIC: int __db_big_log * PUBLIC: __P((DB_LOG *, DB_TXN *, DB_LSN *, u_int32_t, * PUBLIC: u_int32_t, u_int32_t, db_pgno_t, db_pgno_t, - * PUBLIC: db_pgno_t, DBT *, DB_LSN *, DB_LSN *, + * PUBLIC: db_pgno_t, const DBT *, DB_LSN *, DB_LSN *, * PUBLIC: DB_LSN *)); */ int __db_big_log(logp, txnid, ret_lsnp, flags, @@ -415,7 +415,7 @@ int __db_big_log(logp, txnid, ret_lsnp, flags, db_pgno_t pgno; db_pgno_t prev_pgno; db_pgno_t next_pgno; - DBT *dbt; + const DBT *dbt; DB_LSN * pagelsn; DB_LSN * prevlsn; DB_LSN * nextlsn; @@ -1079,7 +1079,7 @@ __db_addpage_read(recbuf, argpp) /* * PUBLIC: int __db_debug_log * PUBLIC: __P((DB_LOG *, DB_TXN *, DB_LSN *, u_int32_t, - * PUBLIC: DBT *, u_int32_t, DBT *, DBT *, + * PUBLIC: const DBT *, u_int32_t, const DBT *, const DBT *, * PUBLIC: u_int32_t)); */ int __db_debug_log(logp, txnid, ret_lsnp, flags, @@ -1088,10 +1088,10 @@ int __db_debug_log(logp, txnid, ret_lsnp, flags, DB_TXN *txnid; DB_LSN *ret_lsnp; u_int32_t flags; - DBT *op; + const DBT *op; u_int32_t fileid; - DBT *key; - DBT *data; + const DBT *key; + const DBT *data; u_int32_t arg_flags; { DBT logrec; diff --git a/db2/db/db_conv.c b/db2/db/db_conv.c index 8eccc2e602..c075df33fe 100644 --- a/db2/db/db_conv.c +++ b/db2/db/db_conv.c @@ -44,7 +44,7 @@ #include "config.h" #ifndef lint -static const char sccsid[] = "@(#)db_conv.c 10.7 (Sleepycat) 9/21/97"; +static const char sccsid[] = "@(#)db_conv.c 10.8 (Sleepycat) 1/8/98"; #endif /* not lint */ #ifndef NO_SYSTEM_INCLUDES @@ -94,7 +94,7 @@ __db_pgout(pg, pagesize, pp) */ static int __db_convert(pg, pp, pagesize, pgin) - db_pgno_t pg; /* Unused, but left for the future. */ + db_pgno_t pg; void *pp; size_t pagesize; int pgin; @@ -107,6 +107,8 @@ __db_convert(pg, pp, pagesize, pgin) db_indx_t i, len, tmp; u_int8_t *p, *end; + COMPQUIET(pg, 0); + h = pp; if (pgin) { M_32_SWAP(h->lsn.file); diff --git a/db2/db/db_dispatch.c b/db2/db/db_dispatch.c index 4f89d2b917..736575adfc 100644 --- a/db2/db/db_dispatch.c +++ b/db2/db/db_dispatch.c @@ -43,7 +43,7 @@ #include "config.h" #ifndef lint -static const char sccsid[] = "@(#)db_dispatch.c 10.7 (Sleepycat) 11/23/97"; +static const char sccsid[] = "@(#)db_dispatch.c 10.9 (Sleepycat) 1/17/98"; #endif /* not lint */ #ifndef NO_SYSTEM_INCLUDES @@ -61,6 +61,7 @@ static const char sccsid[] = "@(#)db_dispatch.c 10.7 (Sleepycat) 11/23/97"; #include "db_dispatch.h" #include "db_am.h" #include "common_ext.h" +#include "log_auto.h" /* * Data structures to manage the DB dispatch table. The dispatch table @@ -113,7 +114,8 @@ __db_dispatch(logp, db, lsnp, redo, info) * seen it, then we call the appropriate recovery routine * in "abort mode". */ - if (__db_txnlist_find(info, txnid) == DB_NOTFOUND) + if (rectype == DB_log_register || + __db_txnlist_find(info, txnid) == DB_NOTFOUND) return ((dispatch_table[rectype])(logp, db, lsnp, TXN_UNDO, info)); break; @@ -122,7 +124,8 @@ __db_dispatch(logp, db, lsnp, redo, info) * In the forward pass, if we haven't seen the transaction, * do nothing, else recovery it. */ - if (__db_txnlist_find(info, txnid) != DB_NOTFOUND) + if (rectype == DB_log_register || + __db_txnlist_find(info, txnid) != DB_NOTFOUND) return ((dispatch_table[rectype])(logp, db, lsnp, TXN_REDO, info)); break; @@ -258,6 +261,8 @@ __db_txnlist_find(listp, txnid) /* * __db_txnlist_print -- * Print out the transaction list. + * + * PUBLIC: void __db_txnlist_print __P((void *)); */ void __db_txnlist_print(listp) diff --git a/db2/db/db_dup.c b/db2/db/db_dup.c index faeefa0744..59dfb85b92 100644 --- a/db2/db/db_dup.c +++ b/db2/db/db_dup.c @@ -8,7 +8,7 @@ #include "config.h" #ifndef lint -static const char sccsid[] = "@(#)db_dup.c 10.10 (Sleepycat) 10/25/97"; +static const char sccsid[] = "@(#)db_dup.c 10.11 (Sleepycat) 1/8/98"; #endif /* not lint */ #ifndef NO_SYSTEM_INCLUDES @@ -369,14 +369,13 @@ __db_dsplit(dbp, hp, indxp, size, newfunc) * __db_ditem -- * Remove an item from a page. * - * PUBLIC: int __db_ditem __P((DB *, PAGE *, int, u_int32_t)); + * PUBLIC: int __db_ditem __P((DB *, PAGE *, u_int32_t, u_int32_t)); */ int __db_ditem(dbp, pagep, indx, nbytes) DB *dbp; PAGE *pagep; - int indx; - u_int32_t nbytes; + u_int32_t indx, nbytes; { DBT ldbt; db_indx_t cnt, offset; diff --git a/db2/db/db_pr.c b/db2/db/db_pr.c index 6b6171a13c..1135a9e738 100644 --- a/db2/db/db_pr.c +++ b/db2/db/db_pr.c @@ -8,7 +8,7 @@ #include "config.h" #ifndef lint -static const char sccsid[] = "@(#)db_pr.c 10.19 (Sleepycat) 11/2/97"; +static const char sccsid[] = "@(#)db_pr.c 10.20 (Sleepycat) 1/8/98"; #endif /* not lint */ #ifndef NO_SYSTEM_INCLUDES @@ -81,7 +81,7 @@ __db_dump(dbp, name, all) { FILE *fp, *save_fp; - save_fp = NULL; /* XXX: Shut the compiler up. */ + COMPQUIET(save_fp, NULL); if (set_psize == PSIZE_BOUNDARY) __db_psize(dbp->mpf); diff --git a/db2/db/db_rec.c b/db2/db/db_rec.c index 2c9ca9abe0..48e09e6f23 100644 --- a/db2/db/db_rec.c +++ b/db2/db/db_rec.c @@ -8,7 +8,7 @@ #include "config.h" #ifndef lint -static const char sccsid[] = "@(#)db_rec.c 10.10 (Sleepycat) 11/2/97"; +static const char sccsid[] = "@(#)db_rec.c 10.12 (Sleepycat) 1/8/98"; #endif /* not lint */ #ifndef NO_SYSTEM_INCLUDES @@ -87,8 +87,8 @@ __db_addrem_recover(logp, dbtp, lsnp, redo, info) } else if ((cmp_n == 0 && !redo && argp->opcode == DB_ADD_DUP) || (cmp_p == 0 && redo && argp->opcode == DB_REM_DUP)) { /* Need to undo an add, or redo a delete. */ - if ((ret = __db_ditem(file_dbp, pagep, argp->indx, - argp->nbytes)) != 0) + if ((ret = __db_ditem(file_dbp, + pagep, argp->indx, argp->nbytes)) != 0) goto out; change = DB_MPOOL_DIRTY; } @@ -585,6 +585,9 @@ __db_debug_recover(logp, dbtp, lsnp, redo, info) __db_debug_args *argp; int ret; + COMPQUIET(redo, 0); + COMPQUIET(logp, NULL); + REC_PRINT(__db_debug_print); REC_NOOP_INTRO(__db_debug_read); @@ -612,6 +615,9 @@ __db_noop_recover(logp, dbtp, lsnp, redo, info) __db_noop_args *argp; int ret; + COMPQUIET(redo, 0); + COMPQUIET(logp, NULL); + REC_PRINT(__db_noop_print); REC_NOOP_INTRO(__db_noop_read); -- cgit 1.4.1