bf7997b65c
1998-06-09 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/netinet/ip.h (struct ip_options): Define __data member only for gcc. Reported by ak@muc.de. * misc/mntent.h: Undo last patch. * sysdeps/unix/sysv/linux/fstatvfs.c (fstatvfs): Undo last patch. * misc/tst/mntent.c: Adjust code for this change. * io/fts.c: Updated from a slightly more recent BSD version. * io/fts.h: Likewise. * libc.map: Add __libc_stack_end. * db2/Makefile (routines): Add lock_region. * db2/config.h: Update from db-2.4.14. * db2/db.h: Likewise. * db2/db_185.h: Likewise. * db2/db_int.h: Likewise. * db2/bt_close.c: Likewise. * db2/bt_compare.c: Likewise. * db2/bt_conv.c: Likewise. * db2/bt_cursor.c: Likewise. * db2/bt_delete.c: Likewise. * db2/bt_open.c: Likewise. * db2/bt_page.c: Likewise. * db2/bt_put.c: Likewise. * db2/bt_rec.c: Likewise. * db2/bt_recno.c: Likewise. * db2/bt_rsearch.c: Likewise. * db2/bt_search.c: Likewise. * db2/bt_split.c: Likewise. * db2/bt_stat.c: Likewise. * db2/btree.src: Likewise. * db2/btree_auto.c: Likewise. * db2/getlong.c: Likewise. * db2/db_appinit.c: Likewise. * db2/db_apprec.c: Likewise. * db2/db_byteorder.c: Likewise. * db2/db_err.c: Likewise. * db2/db_log2.c: Likewise. * db2/db_region.c: Likewise. * db2/db_salloc.c: Likewise. * db2/db_shash.c: Likewise. * db2/db.c: Likewise. * db2/db.src: Likewise. * db2/db_auto.c: Likewise. * db2/db_conv.c: Likewise. * db2/db_dispatch.c: Likewise. * db2/db_dup.c: Likewise. * db2/db_overflow.c: Likewise. * db2/db_pr.c: Likewise. * db2/db_rec.c: Likewise. * db2/db_ret.c: Likewise. * db2/db_thread.c: Likewise. * db2/db185.c: Likewise. * db2/db185_int.h: Likewise. * db2/dbm.c: Likewise. * db2/hash.c: Likewise. * db2/hash.src: Likewise. * db2/hash_auto.c: Likewise. * db2/hash_conv.c: Likewise. * db2/hash_debug.c: Likewise. * db2/hash_dup.c: Likewise. * db2/hash_func.c: Likewise. * db2/hash_page.c: Likewise. * db2/hash_rec.c: Likewise. * db2/hash_stat.c: Likewise. * db2/btree.h: Likewise. * db2/btree_ext.h: Likewise. * db2/clib_ext.h: Likewise. * db2/common_ext.h: Likewise. * db2/cxx_int.h: Likewise. * db2/db.h.src: Likewise. * db2/db_185.h.src: Likewise. * db2/db_am.h: Likewise. * db2/db_auto.h: Likewise. * db2/db_cxx.h: Likewise. * db2/db_dispatch.h: Likewise. * db2/db_ext.h: Likewise. * db2/db_int.h.src: Likewise. * db2/db_page.h: Likewise. * db2/db_shash.h: Likewise. * db2/db_swap.h: Likewise. * db2/hash.h: Likewise. * db2/hash_ext.h: Likewise. * db2/lock.h: Likewise. * db2/lock_ext.h: Likewise. * db2/log.h: Likewise. * db2/log_ext.h: Likewise. * db2/mp.h: Likewise. * db2/mp_ext.h: Likewise. * db2/mutex_ext.h: Likewise. * db2/os_ext.h: Likewise. * db2/os_func.h: Likewise. * db2/queue.h: Likewise. * db2/shqueue.h: Likewise. * db2/txn.h: Likewise. * db2/lock.c: Likewise. * db2/lock_conflict.c: Likewise. * db2/lock_deadlock.c: Likewise. * db2/lock_region.c: Likewise. * db2/lock_util.c: Likewise. * db2/log.c: Likewise. * db2/log.src: Likewise. * db2/log_archive.c: Likewise. * db2/log_auto.c: Likewise. * db2/log_compare.c: Likewise. * db2/log_findckp.c: Likewise. * db2/log_get.c: Likewise. * db2/log_put.c: Likewise. * db2/log_rec.c: Likewise. * db2/log_register.c: Likewise. * db2/mp_bh.c: Likewise. * db2/mp_fget.c: Likewise. * db2/mp_fopen.c: Likewise. * db2/mp_fput.c: Likewise. * db2/mp_fset.c: Likewise. * db2/mp_open.c: Likewise. * db2/mp_pr.c: Likewise. * db2/mp_region.c: Likewise. * db2/mp_sync.c: Likewise. * db2/68020.gcc: Likewise. * db2/mutex.c: Likewise. * db2/parisc.gcc: Likewise. * db2/parisc.hp: Likewise. * db2/sco.cc: Likewise. * db2/os_abs.c: Likewise. * db2/os_alloc.c: Likewise. * db2/os_config.c: Likewise. * db2/os_dir.c: Likewise. * db2/os_fid.c: Likewise. * db2/os_fsync.c: Likewise. * db2/os_map.c: Likewise. * db2/os_oflags.c: Likewise. * db2/os_open.c: Likewise. * db2/os_rpath.c: Likewise. * db2/os_rw.c: Likewise. * db2/os_seek.c: Likewise. * db2/os_sleep.c: Likewise. * db2/os_spin.c: Likewise. * db2/os_stat.c: Likewise. * db2/os_unlink.c: Likewise. * db2/db_archive.c: Likewise. * db2/db_checkpoint.c: Likewise. * db2/db_deadlock.c: Likewise. * db2/db_dump.c: Likewise. * db2/db_dump185.c: Likewise. * db2/db_load.c: Likewise. * db2/db_printlog.c: Likewise. * db2/db_recover.c: Likewise. * db2/db_stat.c: Likewise. * db2/txn.c: Likewise. * db2/txn.src: Likewise. * db2/txn_auto.c: Likewise. * db2/txn_rec.c: Likewise. * elf/rtld.c: Move definition of __libc_stack_end to ... * sysdeps/generic/dl-sysdep.h: ...here. * sysdeps/unix/sysv/linux/fstatvfs.c: Handle nodiratime option. * sysdeps/unix/sysv/linux/bits/statvfs.h: Define ST_NODIRATIME. * sysdeps/unix/sysv/linux/sys/mount.h: Define MS_NODIRATIME. 1998-06-08 21:44 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/fstatvfs.c: Handle constant option string from mntent correctly. 1998-06-06 Andreas Jaeger <aj@arthur.rhein-neckar.de> * sunrpc/Makefile (generated): Correct typo. 1998-06-04 Philip Blundell <philb@gnu.org> * elf/elf.h (EM_ARM, et al.): New definitions. * sysdeps/arm/dl-machine.h: Update for new draft ARM ELF ABI.
308 lines
7.6 KiB
C
308 lines
7.6 KiB
C
/*-
|
|
* See the file LICENSE for redistribution information.
|
|
*
|
|
* Copyright (c) 1996, 1997, 1998
|
|
* Sleepycat Software. All rights reserved.
|
|
*/
|
|
#include "config.h"
|
|
|
|
#ifndef lint
|
|
static const char sccsid[] = "@(#)mp_region.c 10.30 (Sleepycat) 5/31/98";
|
|
#endif /* not lint */
|
|
|
|
#ifndef NO_SYSTEM_INCLUDES
|
|
#include <sys/types.h>
|
|
|
|
#include <errno.h>
|
|
#include <string.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 = R_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 = R_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);
|
|
--mp->stat.st_page_clean;
|
|
|
|
/*
|
|
* Retry as soon as we've freed up sufficient space. If we
|
|
* will have to coalesce 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 = R_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;
|
|
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 = R_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, u_int32_t));
|
|
*/
|
|
int
|
|
__memp_ropen(dbmp, path, cachesize, mode, is_private, flags)
|
|
DB_MPOOL *dbmp;
|
|
const char *path;
|
|
size_t cachesize;
|
|
int mode, is_private;
|
|
u_int32_t flags;
|
|
{
|
|
MPOOL *mp;
|
|
size_t rlen;
|
|
int defcache, ret;
|
|
|
|
/*
|
|
* 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.
|
|
*/
|
|
defcache = 0;
|
|
if (cachesize < DB_CACHESIZE_MIN)
|
|
if (cachesize == 0) {
|
|
defcache = 1;
|
|
cachesize = DB_CACHESIZE_DEF;
|
|
} else
|
|
cachesize = DB_CACHESIZE_MIN;
|
|
rlen = cachesize + cachesize / 4;
|
|
|
|
/*
|
|
* Map in the region.
|
|
*
|
|
* If it's a private mpool, use malloc, it's a lot faster than
|
|
* instantiating a region.
|
|
*/
|
|
dbmp->reginfo.dbenv = dbmp->dbenv;
|
|
dbmp->reginfo.appname = DB_APP_NONE;
|
|
if (path == NULL)
|
|
dbmp->reginfo.path = NULL;
|
|
else
|
|
if ((dbmp->reginfo.path = __db_strdup(path)) == NULL)
|
|
return (ENOMEM);
|
|
dbmp->reginfo.file = DB_DEFAULT_MPOOL_FILE;
|
|
dbmp->reginfo.mode = mode;
|
|
dbmp->reginfo.size = rlen;
|
|
dbmp->reginfo.dbflags = flags;
|
|
dbmp->reginfo.flags = 0;
|
|
if (defcache)
|
|
F_SET(&dbmp->reginfo, REGION_SIZEDEF);
|
|
|
|
/*
|
|
* If we're creating a temporary region, don't use any standard
|
|
* naming.
|
|
*/
|
|
if (is_private) {
|
|
dbmp->reginfo.appname = DB_APP_TMP;
|
|
dbmp->reginfo.file = NULL;
|
|
F_SET(&dbmp->reginfo, REGION_PRIVATE);
|
|
}
|
|
|
|
if ((ret = __db_rattach(&dbmp->reginfo)) != 0) {
|
|
if (dbmp->reginfo.path != NULL)
|
|
FREES(dbmp->reginfo.path);
|
|
return (ret);
|
|
}
|
|
|
|
/*
|
|
* The MPOOL structure is first in the region, the rest of the region
|
|
* is free space.
|
|
*/
|
|
dbmp->mp = dbmp->reginfo.addr;
|
|
dbmp->addr = (u_int8_t *)dbmp->mp + sizeof(MPOOL);
|
|
|
|
/* Initialize a created region. */
|
|
if (F_ISSET(&dbmp->reginfo, REGION_CREATED)) {
|
|
mp = dbmp->mp;
|
|
SH_TAILQ_INIT(&mp->bhq);
|
|
SH_TAILQ_INIT(&mp->bhfq);
|
|
SH_TAILQ_INIT(&mp->mpfq);
|
|
|
|
__db_shalloc_init(dbmp->addr, rlen - sizeof(MPOOL));
|
|
|
|
/*
|
|
* Assume we want to keep the hash chains with under 10 pages
|
|
* on each chain. We don't know the pagesize in advance, and
|
|
* it may differ for different files. Use a pagesize of 1K for
|
|
* the calculation -- we walk these chains a lot, they should
|
|
* be short.
|
|
*/
|
|
mp->htab_buckets =
|
|
__db_tablesize((cachesize / (1 * 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 = R_OFFSET(dbmp, dbmp->htab);
|
|
|
|
ZERO_LSN(mp->lsn);
|
|
mp->lsn_cnt = 0;
|
|
|
|
memset(&mp->stat, 0, sizeof(mp->stat));
|
|
mp->stat.st_cachesize = cachesize;
|
|
|
|
mp->flags = 0;
|
|
}
|
|
|
|
/* Get the local hash table address. */
|
|
dbmp->htab = R_ADDR(dbmp, dbmp->mp->htab);
|
|
|
|
UNLOCKREGION(dbmp);
|
|
return (0);
|
|
|
|
err: UNLOCKREGION(dbmp);
|
|
(void)__db_rdetach(&dbmp->reginfo);
|
|
if (F_ISSET(&dbmp->reginfo, REGION_CREATED))
|
|
(void)memp_unlink(path, 1, dbmp->dbenv);
|
|
|
|
if (dbmp->reginfo.path != NULL)
|
|
FREES(dbmp->reginfo.path);
|
|
return (ret);
|
|
}
|