mirror of
https://sourceware.org/git/glibc.git
synced 2025-07-29 11:41:21 +03:00
Update.
1997-08-10 19:17 Philip Blundell <Philip.Blundell@pobox.com> * nss/nss_db/db-XXX.c: Include <db_185.h> not <db.h>. Somebody should update this to use the new db API. * nss/nss_db/db-netgrp.c: Likewise. * nss/nss_db/db-alias.c: Likewise. * db2/Makefile: Makefile for db-2.x in glibc. 1997-08-27 21:20 Ulrich Drepper <drepper@cygnus.com> * csu/Makefile (before-compile): New goal. Make sure abi-tag.h is generated. [$(elf)=yes] (asm-CPPFLAGS): Make sure abi-tag.h file can be found. * Makeconfig [$(build-omitfp)=yes] (CFLAGS-.o): Add -D__USE_STRING_INLINES. * string/string.f: Move strnlen optimization after inclusion of <bits/string.h>. Include <bits/string.h> only if __USE_STRING_INLINES is defined. * sysdeps/generic/memcpy.c: Undef memcpy to allow macro of this name in <bits/string.h>. * sysdeps/generic/memset.c: Likewise. * sysdeps/i386/string.h: i386 optimized string functions. * sysdeps/i386/i486string.h: i486+ optimized string functions. * Makefile (subdirs): Change db to db2. * shlib-versions: Bump libdb verion number to 3. * include/db.h: Include from db2 directory. * include/db_185.h: New file. * sysdeps/i386/Makefile [$(subdirs)=db2] (CPPFLAGS): Add macros to provide spinlock information for db2. * sysdeps/m68k/m68020/Makefile: New file. Likewise. * sysdeps/sparc/Makefile: New file. Likewise. * sysdeps/unix/sysv/linux/Makefile [$(subdirs)=db2] (CPPFLAGS): Add -DHAVE_LLSEEK. * db2/config.h: Hand-edited config file for db2 in glibc. * db2/compat.h: New file from db-2.3.4. * db2/db.h: Likewise. * db2/db_185.h: Likewise. * db2/db_int.h: Likewise. * db2/makedb.c: Likewise. * db2/btree/bt_close.c: Likewise. * db2/btree/bt_compare.c: Likewise. * db2/btree/bt_conv.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/btree/bt_rsearch.c: Likewise. * db2/btree/bt_search.c: Likewise. * db2/btree/bt_split.c: Likewise. * db2/btree/bt_stat.c: Likewise. * db2/btree/btree.src: Likewise. * db2/common/db_appinit.c: Likewise. * db2/common/db_err.c: Likewise. * db2/common/db_byteorder.c: Likewise. * db2/common/db_apprec.c: Likewise. * db2/common/db_salloc.c: Likewise. * db2/common/db_log2.c: Likewise. * db2/common/db_region.c: Likewise. * db2/common/db_shash.c: Likewise. * db2/db/db.c: Likewise. * db2/db/db.src: Likewise. * db2/db/db_conv.c: Likewise. * db2/db/db_dispatch.c: Likewise. * db2/db/db_dup.c: Likewise. * db2/db/db_overflow.c: Likewise. * db2/db/db_pr.c: Likewise. * db2/db/db_rec.c: Likewise. * db2/db/db_ret.c: Likewise. * db2/db/db_thread.c: Likewise. * db2/db/db_auto.c: Likewise. * db2/db185/db185.c: Likewise. * db2/db185/db185_int.h: Likewise. * db2/dbm/dbm.c: Likewise. * db2/hash/hash.c: Likewise. * db2/hash/hash.src: Likewise. * db2/hash/hash_page.c: Likewise. * db2/hash/hash_conv.c: Likewise. * db2/hash/hash_debug.c: Likewise. * db2/hash/hash_stat.c: Likewise. * db2/hash/hash_rec.c: Likewise. * db2/hash/hash_dup.c: Likewise. * db2/hash/hash_func.c: Likewise. * db2/hash/hash_auto.c: Likewise. * db2/include/mp.h: Likewise. * db2/include/btree.h: Likewise. * db2/include/db.h.src: Likewise. * db2/include/db_int.h.src: Likewise. * db2/include/db_shash.h: Likewise. * db2/include/db_swap.h: Likewise. * db2/include/db_185.h.src: Likewise. * db2/include/txn.h: Likewise. * db2/include/db_am.h: Likewise. * db2/include/shqueue.h: Likewise. * db2/include/hash.h: Likewise. * db2/include/db_dispatch.h: Likewise. * db2/include/lock.h: Likewise. * db2/include/db_page.h: Likewise. * db2/include/log.h: Likewise. * db2/include/db_auto.h: Likewise. * db2/include/btree_auto.h: Likewise. * db2/include/hash_auto.h: Likewise. * db2/include/log_auto.h: Likewise. * db2/include/txn_auto.h: Likewise. * db2/include/db_ext.h: Likewise. * db2/include/btree_ext.h: Likewise. * db2/include/clib_ext.h: Likewise. * db2/include/common_ext.h: Likewise. * db2/include/hash_ext.h: Likewise. * db2/include/lock_ext.h: Likewise. * db2/include/log_ext.h: Likewise. * db2/include/mp_ext.h: Likewise. * db2/include/mutex_ext.h: Likewise. * db2/include/os_ext.h: Likewise. * db2/include/txn_ext.h: Likewise. * db2/include/cxx_int.h: Likewise. * db2/include/db_cxx.h: Likewise. * db2/include/queue.h: Likewise. * db2/lock/lock.c: Likewise. * db2/lock/lock_conflict.c: Likewise. * db2/lock/lock_util.c: Likewise. * db2/lock/lock_deadlock.c: Likewise. * db2/log/log.c: Likewise. * db2/log/log_get.c: Likewise. * db2/log/log.src: Likewise. * db2/log/log_compare.c: Likewise. * db2/log/log_put.c: Likewise. * db2/log/log_rec.c: Likewise. * db2/log/log_archive.c: Likewise. * db2/log/log_register.c: Likewise. * db2/log/log_auto.c: Likewise. * db2/log/log_findckp.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_fset.c: Likewise. * db2/mp/mp_open.c: Likewise. * db2/mp/mp_region.c: Likewise. * db2/mp/mp_pr.c: Likewise. * db2/mp/mp_sync.c: Likewise. * db2/mutex/68020.gcc: Likewise. * db2/mutex/mutex.c: Likewise. * db2/mutex/README: Likewise. * db2/mutex/x86.gcc: Likewise. * db2/mutex/sparc.gcc: Likewise. * db2/mutex/uts4.cc.s: Likewise. * db2/mutex/alpha.dec: Likewise. * db2/mutex/alpha.gcc: Likewise. * db2/mutex/parisc.gcc: Likewise. * db2/mutex/parisc.hp: Likewise. * db2/os/db_os_abs.c: Likewise. * db2/os/db_os_dir.c: Likewise. * db2/os/db_os_fid.c: Likewise. * db2/os/db_os_lseek.c: Likewise. * db2/os/db_os_mmap.c: Likewise. * db2/os/db_os_open.c: Likewise. * db2/os/db_os_rw.c: Likewise. * db2/os/db_os_sleep.c: Likewise. * db2/os/db_os_stat.c: Likewise. * db2/os/db_os_unlink.c: Likewise. * db2/txn/txn.c: Likewise. * db2/txn/txn.src: Likewise. * db2/txn/txn_rec.c: Likewise. * db2/txn/txn_auto.c: Likewise. * db2/clib/getlong.c: Likewise. * db2/progs/db_archive/db_archive.c: Likewise. * db2/progs/db_checkpoint/db_checkpoint.c: Likewise. * db2/progs/db_deadlock/db_deadlock.c: Likewise. * db2/progs/db_dump/db_dump.c: Likewise. * db2/progs/db_dump185/db_dump185.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. * libio/stdio.h [__cplusplus] (__STDIO_INLINE): Define as inline. * po/de.po, po/sv.po: Update from 2.0.5 translations. * sysdeps/unix/sysv/linux/netinet/tcp.h: Pretty print. * sunrpc/rpc/xdr.h (XDR): Don't define argument of x_destroy callback as const. * sunrpc/xdr_mem.c (xdrmem_destroy): Don't define argument as const. * sunrpx/xdr_rec.c (xdrrec_destroy): Likewise. * sunrpx/xdr_stdio.c (xdrstdio_destroy): Likewise. 1997-08-27 18:47 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/if_index.c: Include <errno.h>. Reported by Benjamin Kosnik <bkoz@cygnus.com>. 1997-08-27 02:27 Roland McGrath <roland@baalperazim.frob.com> * abi-tags: New file. * csu/Makefile (distribute): Remove abi-tag.h. ($(objpfx)abi-tag.h): New target. * Makefile (distribute): Add abi-tags. * sysdeps/unix/sysv/linux/abi-tag.h: File removed. * sysdeps/mach/hurd/abi-tag.h: File removed. * sysdeps/stub/abi-tag.h: File removed. 1997-08-25 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/unix/make-syscalls.sh: Change output so that it generates compilation rules only for the currently selected object suffixes. 1997-08-25 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/m68k/dl-machine.h (RTLD_START): Switch back to previous section to avoid confusing the compiler. * sysdeps/alpha/dl-machine.h (RTLD_START): Likewise. * sysdeps/i386/dl-machine.h (RTLD_START): Likewise. * sysdeps/mips/dl-machine.h (RTLD_START): Likewise. * sysdeps/mips/mips64/dl-machine.h (RTLD_START): Likewise. * sysdeps/sparc/sparc32/dl-machine.h (RTLD_START): Likewise. * sysdeps/m68k/dl-machine.h (elf_machine_load_address): Use a GOT relocation instead of a constant to avoid text relocation. (ELF_MACHINE_BEFORE_RTLD_RELOC): Removed. (RTLD_START): Declare global labels as functions and add size directive. 1997-08-25 17:01 Ulrich Drepper <drepper@cygnus.com> * sysdeps/i386/bits/select.h: Correct assembler versions to work even for descriptors >= 32. * stdlib/alloca.h: Don't define alloca to __alloca since if gcc is used __alloca is not defined to __builtin_alloca and so might not be available. Reported by Uwe Ohse <uwe@ohse.de>. * sysdeps/unix/sysv/linux/sys/sysmacros.h: Define macros in a special way if gcc is not used and so dev_t is an array. Reported by Uwe Ohse <uwe@ohse.de>. 1997-08-23 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * manual/libc.texinfo: Reorder chapters to match logical order. 1997-08-25 12:22 Ulrich Drepper <drepper@cygnus.com> * sunrpc/rpc/xdr.h: Change name of parameters in prototypes of xdr_reference, xdrmem_create, and xdrstdio_create because of clash with g++ internal symbols. Patch by Sudish Joseph <sj@eng.mindspring.net>. * elf/dl-deps.c: Implement handling of DT_FILTER.
This commit is contained in:
Ulrich Drepper
257
db2/btree/bt_stat.c
Normal file
257
db2/btree/bt_stat.c
Normal file
@ -0,0 +1,257 @@
|
||||
/*-
|
||||
* See the file LICENSE for redistribution information.
|
||||
*
|
||||
* Copyright (c) 1996, 1997
|
||||
* Sleepycat Software. All rights reserved.
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
|
||||
#ifndef lint
|
||||
static const char sccsid[] = "@(#)bt_stat.c 10.11 (Sleepycat) 8/19/97";
|
||||
#endif /* not lint */
|
||||
|
||||
#ifndef NO_SYSTEM_INCLUDES
|
||||
#include <sys/types.h>
|
||||
|
||||
#include <errno.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#endif
|
||||
|
||||
#include "db_int.h"
|
||||
#include "db_page.h"
|
||||
#include "btree.h"
|
||||
|
||||
static void __bam_add_rstat __P((DB_BTREE_LSTAT *, DB_BTREE_STAT *));
|
||||
|
||||
/*
|
||||
* __bam_stat --
|
||||
* Gather/print the btree statistics
|
||||
*
|
||||
* PUBLIC: int __bam_stat __P((DB *, void *, void *(*)(size_t), int));
|
||||
*/
|
||||
int
|
||||
__bam_stat(argdbp, spp, db_malloc, flags)
|
||||
DB *argdbp;
|
||||
void *spp;
|
||||
void *(*db_malloc) __P((size_t));
|
||||
int flags;
|
||||
{
|
||||
BTMETA *meta;
|
||||
BTREE *t;
|
||||
DB *dbp;
|
||||
DB_BTREE_STAT *sp;
|
||||
DB_LOCK lock;
|
||||
PAGE *h;
|
||||
db_pgno_t lastpgno, pgno;
|
||||
int ret;
|
||||
|
||||
DEBUG_LWRITE(argdbp, NULL, "bam_stat", NULL, NULL, flags);
|
||||
|
||||
/* Check for invalid flags. */
|
||||
if ((ret = __db_statchk(argdbp, flags)) != 0)
|
||||
return (ret);
|
||||
|
||||
if (spp == NULL)
|
||||
return (0);
|
||||
|
||||
GETHANDLE(argdbp, NULL, &dbp, ret);
|
||||
t = dbp->internal;
|
||||
|
||||
/* Allocate and clear the structure. */
|
||||
if ((sp = db_malloc == NULL ?
|
||||
(DB_BTREE_STAT *)malloc(sizeof(*sp)) :
|
||||
(DB_BTREE_STAT *)db_malloc(sizeof(*sp))) == NULL) {
|
||||
ret = ENOMEM;
|
||||
goto err;
|
||||
}
|
||||
memset(sp, 0, sizeof(*sp));
|
||||
|
||||
/* If the app just wants the record count, make it fast. */
|
||||
if (LF_ISSET(DB_RECORDCOUNT)) {
|
||||
pgno = PGNO_ROOT;
|
||||
if ((ret = __bam_lget(dbp, 0, pgno, DB_LOCK_READ, &lock)) != 0)
|
||||
goto err;
|
||||
if ((ret = __bam_pget(dbp, (PAGE **)&h, &pgno, 0)) != 0)
|
||||
goto err;
|
||||
|
||||
sp->bt_nrecs = RE_NREC(h);
|
||||
|
||||
(void)memp_fput(dbp->mpf, h, 0);
|
||||
(void)__BT_LPUT(dbp, lock);
|
||||
goto done;
|
||||
}
|
||||
|
||||
/* Get the meta-data page. */
|
||||
pgno = PGNO_METADATA;
|
||||
if ((ret = __bam_lget(dbp, 0, pgno, DB_LOCK_READ, &lock)) != 0)
|
||||
goto err;
|
||||
if ((ret = __bam_pget(dbp, (PAGE **)&meta, &pgno, 0)) != 0)
|
||||
goto err;
|
||||
|
||||
/* Translate the metadata flags. */
|
||||
if (F_ISSET(meta, BTM_DUP))
|
||||
sp->bt_flags |= DB_DUP;
|
||||
if (F_ISSET(meta, BTM_FIXEDLEN))
|
||||
sp->bt_flags |= DB_FIXEDLEN;
|
||||
if (F_ISSET(meta, BTM_RECNUM))
|
||||
sp->bt_flags |= DB_RECNUM;
|
||||
if (F_ISSET(meta, BTM_RENUMBER))
|
||||
sp->bt_flags |= DB_RENUMBER;
|
||||
|
||||
/*
|
||||
* Get the maxkey, minkey, re_len and re_pad fields from the
|
||||
* metadata.
|
||||
*/
|
||||
sp->bt_minkey = meta->minkey;
|
||||
sp->bt_maxkey = meta->maxkey;
|
||||
sp->bt_re_len = meta->re_len;
|
||||
sp->bt_re_pad = meta->re_pad;
|
||||
|
||||
/* Get the page size from the DB. */
|
||||
sp->bt_pagesize = dbp->pgsize;
|
||||
|
||||
/* Initialize counters with the meta-data page information. */
|
||||
__bam_add_rstat(&meta->stat, sp);
|
||||
|
||||
/*
|
||||
* Add in the local information from this handle.
|
||||
*
|
||||
* !!!
|
||||
* This is a bit odd, but it gets us closer to the truth.
|
||||
*/
|
||||
__bam_add_rstat(&t->lstat, sp);
|
||||
|
||||
/* Walk the free list, counting pages. */
|
||||
for (sp->bt_free = 0, pgno = meta->free; pgno != PGNO_INVALID;) {
|
||||
++sp->bt_free;
|
||||
|
||||
if ((ret = __bam_pget(dbp, &h, &pgno, 0)) != 0) {
|
||||
(void)memp_fput(dbp->mpf, meta, 0);
|
||||
(void)__BT_TLPUT(dbp, lock);
|
||||
goto err;
|
||||
}
|
||||
pgno = h->next_pgno;
|
||||
(void)memp_fput(dbp->mpf, h, 0);
|
||||
}
|
||||
|
||||
/* Discard the meta-data page. */
|
||||
(void)memp_fput(dbp->mpf, meta, 0);
|
||||
(void)__BT_TLPUT(dbp, lock);
|
||||
|
||||
/* Get the root page. */
|
||||
pgno = PGNO_ROOT;
|
||||
if ((ret = __bam_lget(dbp, 0, PGNO_ROOT, DB_LOCK_READ, &lock)) != 0)
|
||||
goto err;
|
||||
if ((ret = __bam_pget(dbp, &h, &pgno, 0)) != 0) {
|
||||
(void)__BT_LPUT(dbp, lock);
|
||||
goto err;
|
||||
}
|
||||
|
||||
/* Get the levels from the root page. */
|
||||
sp->bt_levels = h->level;
|
||||
|
||||
/*
|
||||
* Determine the last page of the database, then walk it, counting
|
||||
* things.
|
||||
*/
|
||||
if ((ret = memp_fget(dbp->mpf, &lastpgno, DB_MPOOL_LAST, &h)) != 0)
|
||||
goto err;
|
||||
(void)memp_fput(dbp->mpf, h, 0);
|
||||
for (;;) {
|
||||
switch (TYPE(h)) {
|
||||
case P_INVALID:
|
||||
break;
|
||||
case P_IBTREE:
|
||||
case P_IRECNO:
|
||||
++sp->bt_int_pg;
|
||||
sp->bt_int_pgfree += HOFFSET(h) - LOFFSET(h);
|
||||
break;
|
||||
case P_LBTREE:
|
||||
++sp->bt_leaf_pg;
|
||||
sp->bt_leaf_pgfree += HOFFSET(h) - LOFFSET(h);
|
||||
sp->bt_nrecs += NUM_ENT(h) / P_INDX;
|
||||
break;
|
||||
case P_LRECNO:
|
||||
++sp->bt_leaf_pg;
|
||||
sp->bt_leaf_pgfree += HOFFSET(h) - LOFFSET(h);
|
||||
sp->bt_nrecs += NUM_ENT(h);
|
||||
break;
|
||||
case P_DUPLICATE:
|
||||
++sp->bt_dup_pg;
|
||||
/* XXX MARGO: sp->bt_dup_pgfree; */
|
||||
break;
|
||||
case P_OVERFLOW:
|
||||
++sp->bt_over_pg;
|
||||
/* XXX MARGO: sp->bt_over_pgfree; */
|
||||
break;
|
||||
default:
|
||||
(void)memp_fput(dbp->mpf, h, 0);
|
||||
(void)__BT_LPUT(dbp, lock);
|
||||
return (__db_pgfmt(dbp, pgno));
|
||||
}
|
||||
|
||||
(void)memp_fput(dbp->mpf, h, 0);
|
||||
(void)__BT_LPUT(dbp, lock);
|
||||
|
||||
if (++pgno > lastpgno)
|
||||
break;
|
||||
if (__bam_lget(dbp, 0, pgno, DB_LOCK_READ, &lock))
|
||||
break;
|
||||
if (memp_fget(dbp->mpf, &pgno, 0, &h) != 0) {
|
||||
(void)__BT_LPUT(dbp, lock);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
done: *(DB_BTREE_STAT **)spp = sp;
|
||||
ret = 0;
|
||||
|
||||
err: PUTHANDLE(dbp);
|
||||
return (ret);
|
||||
}
|
||||
|
||||
/*
|
||||
* __bam_add_mstat --
|
||||
* Add the local statistics to the meta-data page statistics.
|
||||
*
|
||||
* PUBLIC: void __bam_add_mstat __P((DB_BTREE_LSTAT *, DB_BTREE_LSTAT *));
|
||||
*/
|
||||
void
|
||||
__bam_add_mstat(from, to)
|
||||
DB_BTREE_LSTAT *from;
|
||||
DB_BTREE_LSTAT *to;
|
||||
{
|
||||
to->bt_freed += from->bt_freed;
|
||||
to->bt_pfxsaved += from->bt_pfxsaved;
|
||||
to->bt_split += from->bt_split;
|
||||
to->bt_rootsplit += from->bt_rootsplit;
|
||||
to->bt_fastsplit += from->bt_fastsplit;
|
||||
to->bt_added += from->bt_added;
|
||||
to->bt_deleted += from->bt_deleted;
|
||||
to->bt_get += from->bt_get;
|
||||
to->bt_cache_hit += from->bt_cache_hit;
|
||||
to->bt_cache_miss += from->bt_cache_miss;
|
||||
}
|
||||
|
||||
/*
|
||||
* __bam_add_rstat --
|
||||
* Add the local statistics to the returned statistics.
|
||||
*/
|
||||
static void
|
||||
__bam_add_rstat(from, to)
|
||||
DB_BTREE_LSTAT *from;
|
||||
DB_BTREE_STAT *to;
|
||||
{
|
||||
to->bt_freed += from->bt_freed;
|
||||
to->bt_pfxsaved += from->bt_pfxsaved;
|
||||
to->bt_split += from->bt_split;
|
||||
to->bt_rootsplit += from->bt_rootsplit;
|
||||
to->bt_fastsplit += from->bt_fastsplit;
|
||||
to->bt_added += from->bt_added;
|
||||
to->bt_deleted += from->bt_deleted;
|
||||
to->bt_get += from->bt_get;
|
||||
to->bt_cache_hit += from->bt_cache_hit;
|
||||
to->bt_cache_miss += from->bt_cache_miss;
|
||||
}
|
||||
Reference in New Issue
Block a user