glibc/db2/mp/mp_region.c
Ulrich Drepper 92f1da4da0 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.
1997-08-27 20:26:10 +00:00

341 lines
8.4 KiB
C

/*-
* 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[] = "@(#)mp_region.c 10.11 (Sleepycat) 8/2/97";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
#include <sys/types.h>
#include <sys/stat.h>
#include <errno.h>
#include <fcntl.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#endif
#include "db_int.h"
#include "shqueue.h"
#include "db_shash.h"
#include "mp.h"
#include "common_ext.h"
/*
* __memp_ralloc --
* Allocate some space in the mpool region.
*
* PUBLIC: int __memp_ralloc __P((DB_MPOOL *, size_t, size_t *, void *));
*/
int
__memp_ralloc(dbmp, len, offsetp, retp)
DB_MPOOL *dbmp;
size_t len, *offsetp;
void *retp;
{
BH *bhp, *nbhp;
MPOOL *mp;
MPOOLFILE *mfp;
size_t fsize, total;
int nomore, restart, ret, wrote;
void *p;
mp = dbmp->mp;
nomore = 0;
alloc: if ((ret = __db_shalloc(dbmp->addr, len, MUTEX_ALIGNMENT, &p)) == 0) {
if (offsetp != NULL)
*offsetp = OFFSET(dbmp, p);
*(void **)retp = p;
return (0);
}
if (nomore) {
__db_err(dbmp->dbenv, "%s", strerror(ret));
return (ret);
}
/* Look for a buffer on the free list that's the right size. */
for (bhp =
SH_TAILQ_FIRST(&mp->bhfq, __bh); bhp != NULL; bhp = nbhp) {
nbhp = SH_TAILQ_NEXT(bhp, q, __bh);
if (__db_shsizeof(bhp) == len) {
SH_TAILQ_REMOVE(&mp->bhfq, bhp, q, __bh);
if (offsetp != NULL)
*offsetp = OFFSET(dbmp, bhp);
*(void **)retp = bhp;
return (0);
}
}
/* Discard from the free list until we've freed enough memory. */
total = 0;
for (bhp =
SH_TAILQ_FIRST(&mp->bhfq, __bh); bhp != NULL; bhp = nbhp) {
nbhp = SH_TAILQ_NEXT(bhp, q, __bh);
SH_TAILQ_REMOVE(&mp->bhfq, bhp, q, __bh);
__db_shalloc_free(dbmp->addr, bhp);
/*
* Retry as soon as we've freed up sufficient space. If we
* have to coalesce of memory to satisfy the request, don't
* try until it's likely (possible?) that we'll succeed.
*/
total += fsize = __db_shsizeof(bhp);
if (fsize >= len || total >= 3 * len)
goto alloc;
}
retry: /* Find a buffer we can flush; pure LRU. */
total = 0;
for (bhp =
SH_TAILQ_FIRST(&mp->bhq, __bh); bhp != NULL; bhp = nbhp) {
nbhp = SH_TAILQ_NEXT(bhp, q, __bh);
/* Ignore pinned or locked (I/O in progress) buffers. */
if (bhp->ref != 0 || F_ISSET(bhp, BH_LOCKED))
continue;
/* Find the associated MPOOLFILE. */
mfp = ADDR(dbmp, bhp->mf_offset);
/*
* Write the page if it's dirty.
*
* If we wrote the page, fall through and free the buffer. We
* don't have to rewalk the list to acquire the buffer because
* it was never available for any other process to modify it.
* If we didn't write the page, but we discarded and reacquired
* the region lock, restart the buffer list walk. If we neither
* wrote the buffer nor discarded the region lock, continue down
* the buffer list.
*/
if (F_ISSET(bhp, BH_DIRTY)) {
if ((ret = __memp_bhwrite(dbmp,
mfp, bhp, &restart, &wrote)) != 0)
return (ret);
/*
* It's possible that another process wants this buffer
* and incremented the ref count while we were writing
* it.
*/
if (bhp->ref != 0)
goto retry;
if (wrote)
++mp->stat.st_rw_evict;
else {
if (restart)
goto retry;
else
continue;
}
} else
++mp->stat.st_ro_evict;
/*
* Check to see if the buffer is the size we're looking for.
* If it is, simply reuse it.
*/
total += fsize = __db_shsizeof(bhp);
if (fsize == len) {
__memp_bhfree(dbmp, mfp, bhp, 0);
if (offsetp != NULL)
*offsetp = OFFSET(dbmp, bhp);
*(void **)retp = bhp;
return (0);
}
/* Free the buffer. */
__memp_bhfree(dbmp, mfp, bhp, 1);
/*
* Retry as soon as we've freed up sufficient space. If we
* have to coalesce of memory to satisfy the request, don't
* try until it's likely (possible?) that we'll succeed.
*/
if (fsize >= len || total >= 3 * len)
goto alloc;
/* Restart the walk if we discarded the region lock. */
if (restart)
goto retry;
}
nomore = 1;
goto alloc;
}
/*
* __memp_ropen --
* Attach to, and optionally create, the mpool region.
*
* PUBLIC: int __memp_ropen
* PUBLIC: __P((DB_MPOOL *, const char *, size_t, int, int));
*/
int
__memp_ropen(dbmp, path, cachesize, mode, flags)
DB_MPOOL *dbmp;
const char *path;
size_t cachesize;
int mode, flags;
{
MPOOL *mp;
size_t rlen;
int fd, newregion, ret, retry_cnt;
/*
* Unlike other DB subsystems, mpool can't simply grow the region
* because it returns pointers into the region to its clients. To
* "grow" the region, we'd have to allocate a new region and then
* store a region number in the structures that reference regional
* objects. It's reasonable that we fail regardless, as clients
* shouldn't have every page in the region pinned, so the only
* "failure" mode should be a performance penalty because we don't
* find a page in the cache that we'd like to have found.
*
* Up the user's cachesize by 25% to account for our overhead.
*/
if (cachesize < DB_CACHESIZE_MIN)
if (cachesize == 0)
cachesize = DB_CACHESIZE_DEF;
else
cachesize = DB_CACHESIZE_MIN;
rlen = cachesize + cachesize / 4;
/* Map in the region. */
retry_cnt = newregion = 0;
retry: if (LF_ISSET(DB_CREATE)) {
/*
* If it's a private mpool, use malloc, it's a lot faster than
* instantiating a region.
*
* XXX
* If we're doing locking and don't have spinlocks for this
* architecture, we'd have to instantiate the file, we need
* the file descriptor for locking. However, it should not
* be possible for DB_THREAD to be set if HAVE_SPINLOCKS aren't
* defined.
*/
if (F_ISSET(dbmp, MP_ISPRIVATE))
ret = (dbmp->maddr = malloc(rlen)) == NULL ? ENOMEM : 0;
else
ret = __db_rcreate(dbmp->dbenv, DB_APP_NONE, path,
DB_DEFAULT_MPOOL_FILE, mode, rlen, &fd,
&dbmp->maddr);
if (ret == 0) {
/* Put the MPOOL structure first in the region. */
mp = dbmp->maddr;
SH_TAILQ_INIT(&mp->bhq);
SH_TAILQ_INIT(&mp->bhfq);
SH_TAILQ_INIT(&mp->mpfq);
/* Initialize the rest of the region as free space. */
dbmp->addr = (u_int8_t *)dbmp->maddr + sizeof(MPOOL);
__db_shalloc_init(dbmp->addr, rlen - sizeof(MPOOL));
/*
*
* Pretend that the cache will be broken up into 4K
* pages, and that we want to keep it under, say, 10
* pages on each chain. This means a 256MB cache will
* allocate ~6500 offset pairs.
*/
mp->htab_buckets =
__db_tablesize((cachesize / (4 * 1024)) / 10);
/* Allocate hash table space and initialize it. */
if ((ret = __db_shalloc(dbmp->addr,
mp->htab_buckets * sizeof(DB_HASHTAB),
0, &dbmp->htab)) != 0)
goto err;
__db_hashinit(dbmp->htab, mp->htab_buckets);
mp->htab = OFFSET(dbmp, dbmp->htab);
memset(&mp->stat, 0, sizeof(mp->stat));
mp->stat.st_cachesize = cachesize;
mp->flags = 0;
newregion = 1;
} else if (ret != EEXIST)
return (ret);
}
/* If we didn't or couldn't create the region, try and join it. */
if (!newregion &&
(ret = __db_ropen(dbmp->dbenv, DB_APP_NONE,
path, DB_DEFAULT_MPOOL_FILE, 0, &fd, &dbmp->maddr)) != 0) {
/*
* If we failed because the file wasn't available, wait a
* second and try again.
*/
if (ret == EAGAIN && ++retry_cnt < 3) {
(void)__db_sleep(1, 0);
goto retry;
}
return (ret);
}
/* Set up the common pointers. */
dbmp->mp = dbmp->maddr;
dbmp->addr = (u_int8_t *)dbmp->maddr + sizeof(MPOOL);
/*
* If not already locked, lock the region -- if it's a new region,
* then either __db_rcreate() locked it for us or we malloc'd it
* instead of creating a region, neither of which requires locking
* here.
*/
if (!newregion)
LOCKREGION(dbmp);
/*
* Get the hash table address; it's on the shared page, so we have
* to lock first.
*/
dbmp->htab = ADDR(dbmp, dbmp->mp->htab);
dbmp->fd = fd;
/* If we locked the region, release it now. */
if (!F_ISSET(dbmp, MP_ISPRIVATE))
UNLOCKREGION(dbmp);
return (0);
err: if (fd != -1) {
dbmp->fd = fd;
(void)__memp_rclose(dbmp);
}
if (newregion)
(void)memp_unlink(path, 1, dbmp->dbenv);
return (ret);
}
/*
* __memp_rclose --
* Close the mpool region.
*
* PUBLIC: int __memp_rclose __P((DB_MPOOL *));
*/
int
__memp_rclose(dbmp)
DB_MPOOL *dbmp;
{
if (F_ISSET(dbmp, MP_ISPRIVATE)) {
free(dbmp->maddr);
return (0);
}
return (__db_rclose(dbmp->dbenv, dbmp->fd, dbmp->maddr));
}