mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-21 01:12:26 +08:00
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.
317 lines
7.8 KiB
C
317 lines
7.8 KiB
C
/*-
|
|
* See the file LICENSE for redistribution information.
|
|
*
|
|
* Copyright (c) 1996, 1997, 1998
|
|
* Sleepycat Software. All rights reserved.
|
|
*/
|
|
/*
|
|
* Copyright (c) 1990, 1993, 1994, 1995, 1996
|
|
* Keith Bostic. All rights reserved.
|
|
*/
|
|
/*
|
|
* Copyright (c) 1990, 1993, 1994, 1995
|
|
* The Regents of the University of California. All rights reserved.
|
|
*
|
|
* This code is derived from software contributed to Berkeley by
|
|
* Mike Olson.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
* 3. All advertising materials mentioning features or use of this software
|
|
* must display the following acknowledgement:
|
|
* This product includes software developed by the University of
|
|
* California, Berkeley and its contributors.
|
|
* 4. Neither the name of the University nor the names of its contributors
|
|
* may be used to endorse or promote products derived from this software
|
|
* without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*/
|
|
|
|
#include "config.h"
|
|
|
|
#ifndef lint
|
|
static const char sccsid[] = "@(#)bt_page.c 10.12 (Sleepycat) 5/6/98";
|
|
#endif /* not lint */
|
|
|
|
#ifndef NO_SYSTEM_INCLUDES
|
|
#include <sys/types.h>
|
|
|
|
#include <errno.h>
|
|
#include <string.h>
|
|
#endif
|
|
|
|
#include "db_int.h"
|
|
#include "db_page.h"
|
|
#include "btree.h"
|
|
|
|
/*
|
|
* __bam_new --
|
|
* Get a new page, preferably from the freelist.
|
|
*
|
|
* PUBLIC: int __bam_new __P((DB *, u_int32_t, PAGE **));
|
|
*/
|
|
int
|
|
__bam_new(dbp, type, pagepp)
|
|
DB *dbp;
|
|
u_int32_t type;
|
|
PAGE **pagepp;
|
|
{
|
|
BTMETA *meta;
|
|
DB_LOCK metalock;
|
|
PAGE *h;
|
|
db_pgno_t pgno;
|
|
int ret;
|
|
|
|
meta = NULL;
|
|
h = NULL;
|
|
metalock = LOCK_INVALID;
|
|
|
|
pgno = PGNO_METADATA;
|
|
if ((ret = __bam_lget(dbp, 0, pgno, DB_LOCK_WRITE, &metalock)) != 0)
|
|
goto err;
|
|
if ((ret = __bam_pget(dbp, (PAGE **)&meta, &pgno, 0)) != 0)
|
|
goto err;
|
|
|
|
if (meta->free == PGNO_INVALID) {
|
|
if ((ret = __bam_pget(dbp, &h, &pgno, DB_MPOOL_NEW)) != 0)
|
|
goto err;
|
|
ZERO_LSN(h->lsn);
|
|
h->pgno = pgno;
|
|
} else {
|
|
pgno = meta->free;
|
|
if ((ret = __bam_pget(dbp, &h, &pgno, 0)) != 0)
|
|
goto err;
|
|
meta->free = h->next_pgno;
|
|
}
|
|
|
|
/* Log the change. */
|
|
if (DB_LOGGING(dbp)) {
|
|
if ((ret = __bam_pg_alloc_log(dbp->dbenv->lg_info, dbp->txn,
|
|
&meta->lsn, 0, dbp->log_fileid, &meta->lsn, &h->lsn,
|
|
h->pgno, (u_int32_t)type, meta->free)) != 0)
|
|
goto err;
|
|
LSN(h) = LSN(meta);
|
|
}
|
|
|
|
(void)memp_fput(dbp->mpf, (PAGE *)meta, DB_MPOOL_DIRTY);
|
|
(void)__BT_TLPUT(dbp, metalock);
|
|
|
|
P_INIT(h, dbp->pgsize, h->pgno, PGNO_INVALID, PGNO_INVALID, 0, type);
|
|
*pagepp = h;
|
|
return (0);
|
|
|
|
err: if (h != NULL)
|
|
(void)memp_fput(dbp->mpf, h, 0);
|
|
if (meta != NULL)
|
|
(void)memp_fput(dbp->mpf, meta, 0);
|
|
if (metalock != LOCK_INVALID)
|
|
(void)__BT_TLPUT(dbp, metalock);
|
|
return (ret);
|
|
}
|
|
|
|
/*
|
|
* __bam_free --
|
|
* Add a page to the head of the freelist.
|
|
*
|
|
* PUBLIC: int __bam_free __P((DB *, PAGE *));
|
|
*/
|
|
int
|
|
__bam_free(dbp, h)
|
|
DB *dbp;
|
|
PAGE *h;
|
|
{
|
|
BTMETA *meta;
|
|
DBT ldbt;
|
|
DB_LOCK metalock;
|
|
db_pgno_t pgno;
|
|
u_int32_t dirty_flag;
|
|
int ret, t_ret;
|
|
|
|
/*
|
|
* Retrieve the metadata page and insert the page at the head of
|
|
* the free list. If either the lock get or page get routines
|
|
* fail, then we need to put the page with which we were called
|
|
* back because our caller assumes we take care of it.
|
|
*/
|
|
dirty_flag = 0;
|
|
pgno = PGNO_METADATA;
|
|
if ((ret = __bam_lget(dbp, 0, pgno, DB_LOCK_WRITE, &metalock)) != 0)
|
|
goto err;
|
|
if ((ret = __bam_pget(dbp, (PAGE **)&meta, &pgno, 0)) != 0) {
|
|
(void)__BT_TLPUT(dbp, metalock);
|
|
goto err;
|
|
}
|
|
|
|
/* Log the change. */
|
|
if (DB_LOGGING(dbp)) {
|
|
memset(&ldbt, 0, sizeof(ldbt));
|
|
ldbt.data = h;
|
|
ldbt.size = P_OVERHEAD;
|
|
if ((ret = __bam_pg_free_log(dbp->dbenv->lg_info,
|
|
dbp->txn, &meta->lsn, 0, dbp->log_fileid, h->pgno,
|
|
&meta->lsn, &ldbt, meta->free)) != 0) {
|
|
(void)memp_fput(dbp->mpf, (PAGE *)meta, 0);
|
|
(void)__BT_TLPUT(dbp, metalock);
|
|
return (ret);
|
|
}
|
|
LSN(h) = LSN(meta);
|
|
}
|
|
|
|
/*
|
|
* The page should have nothing interesting on it, re-initialize it,
|
|
* leaving only the page number and the LSN.
|
|
*/
|
|
#ifdef DIAGNOSTIC
|
|
{ db_pgno_t __pgno; DB_LSN __lsn;
|
|
__pgno = h->pgno;
|
|
__lsn = h->lsn;
|
|
memset(h, 0xff, dbp->pgsize);
|
|
h->pgno = __pgno;
|
|
h->lsn = __lsn;
|
|
}
|
|
#endif
|
|
P_INIT(h, dbp->pgsize, h->pgno, PGNO_INVALID, meta->free, 0, P_INVALID);
|
|
|
|
/* Link the page on the metadata free list. */
|
|
meta->free = h->pgno;
|
|
|
|
/* Discard the metadata page. */
|
|
ret = memp_fput(dbp->mpf, (PAGE *)meta, DB_MPOOL_DIRTY);
|
|
if ((t_ret = __BT_TLPUT(dbp, metalock)) != 0)
|
|
ret = t_ret;
|
|
|
|
/* Discard the caller's page reference. */
|
|
dirty_flag = DB_MPOOL_DIRTY;
|
|
err: if ((t_ret = memp_fput(dbp->mpf, h, dirty_flag)) != 0 && ret == 0)
|
|
ret = t_ret;
|
|
|
|
/*
|
|
* XXX
|
|
* We have to unlock the caller's page in the caller!
|
|
*/
|
|
return (ret);
|
|
}
|
|
|
|
#ifdef DEBUG
|
|
/*
|
|
* __bam_lt --
|
|
* Print out the list of currently held locks.
|
|
*
|
|
* PUBLIC: int __bam_lt __P((DB *));
|
|
*/
|
|
int
|
|
__bam_lt(dbp)
|
|
DB *dbp;
|
|
{
|
|
DB_LOCKREQ req;
|
|
|
|
if (F_ISSET(dbp, DB_AM_LOCKING)) {
|
|
req.op = DB_LOCK_DUMP;
|
|
lock_vec(dbp->dbenv->lk_info, dbp->locker, 0, &req, 1, NULL);
|
|
}
|
|
return (0);
|
|
}
|
|
#endif
|
|
|
|
/*
|
|
* __bam_lget --
|
|
* The standard lock get call.
|
|
*
|
|
* PUBLIC: int __bam_lget __P((DB *, int, db_pgno_t, db_lockmode_t, DB_LOCK *));
|
|
*/
|
|
int
|
|
__bam_lget(dbp, do_couple, pgno, mode, lockp)
|
|
DB *dbp;
|
|
int do_couple;
|
|
db_pgno_t pgno;
|
|
db_lockmode_t mode;
|
|
DB_LOCK *lockp;
|
|
{
|
|
DB_LOCKREQ couple[2];
|
|
u_int32_t locker;
|
|
int ret;
|
|
|
|
if (!F_ISSET(dbp, DB_AM_LOCKING)) {
|
|
*lockp = LOCK_INVALID;
|
|
return (0);
|
|
}
|
|
|
|
locker = dbp->txn == NULL ? dbp->locker : dbp->txn->txnid;
|
|
dbp->lock.pgno = pgno;
|
|
|
|
/*
|
|
* If the object not currently locked, acquire the lock and return,
|
|
* otherwise, lock couple. If we fail and it's not a system error,
|
|
* convert to EAGAIN.
|
|
*/
|
|
if (do_couple) {
|
|
couple[0].op = DB_LOCK_GET;
|
|
couple[0].obj = &dbp->lock_dbt;
|
|
couple[0].mode = mode;
|
|
couple[1].op = DB_LOCK_PUT;
|
|
couple[1].lock = *lockp;
|
|
|
|
ret = lock_vec(dbp->dbenv->lk_info, locker, 0, couple, 2, NULL);
|
|
if (ret != 0) {
|
|
/* If we fail, discard the lock we held. */
|
|
__bam_lput(dbp, *lockp);
|
|
|
|
return (ret < 0 ? EAGAIN : ret);
|
|
}
|
|
*lockp = couple[0].lock;
|
|
} else {
|
|
ret = lock_get(dbp->dbenv->lk_info,
|
|
locker, 0, &dbp->lock_dbt, mode, lockp);
|
|
return (ret < 0 ? EAGAIN : ret);
|
|
}
|
|
return (0);
|
|
}
|
|
|
|
/*
|
|
* __bam_lput --
|
|
* The standard lock put call.
|
|
*
|
|
* PUBLIC: int __bam_lput __P((DB *, DB_LOCK));
|
|
*/
|
|
int
|
|
__bam_lput(dbp, lock)
|
|
DB *dbp;
|
|
DB_LOCK lock;
|
|
{
|
|
return (__BT_LPUT(dbp, lock));
|
|
}
|
|
|
|
/*
|
|
* __bam_pget --
|
|
* The standard page get call.
|
|
*
|
|
* PUBLIC: int __bam_pget __P((DB *, PAGE **, db_pgno_t *, u_int32_t));
|
|
*/
|
|
int
|
|
__bam_pget(dbp, hp, pgnop, mpool_flags)
|
|
DB *dbp;
|
|
PAGE **hp;
|
|
db_pgno_t *pgnop;
|
|
u_int32_t mpool_flags;
|
|
{
|
|
return (memp_fget((dbp)->mpf,
|
|
pgnop, mpool_flags, hp) == 0 ? 0 : __db_pgerr(dbp, *pgnop));
|
|
}
|