mirror of
https://sourceware.org/git/glibc.git
synced 2024-10-03 20:47:42 +00:00
26b4d76671
1997-09-05 03:15 Ulrich Drepper <drepper@cygnus.com> * Makefile (subdirs): Reorganize order so that nss follows add-ons. * config.make.in (LDAP): Add. * configure.in: Prepare for ldap add-on. * shlib-versions: Add version numbers for ldap NSS module. * nss/Makefile: Add rules to build ldap NSS module. * db/btree/bt_page.c (__bt_free): Update meta data information. Update db from db-2.3.6. * db2/db.h: Updated. * db2/btree/bt_close.c: Updated. * db2/btree/bt_compare.c: Updated. * db2/btree/bt_conv.c: Updated. * db2/btree/bt_cursor.c: Updated. * db2/btree/bt_delete.c: Updated. * db2/btree/bt_put.c: Updated. * db2/btree/bt_rec.c: Updated. * db2/btree/bt_recno.c: Updated. * db2/btree/bt_search.c: Updated. * db2/btree/bt_split.c: Updated. * db2/btree/bt_stat.c: Updated. * db2/common/db_appinit.c: Updated. * db2/common/db_apprec.c: Updated. * db2/common/db_byteorder.c: Updated. * db2/common/db_err.c: Updated. * db2/common/db_region.c: Updated. * db2/db/db.c: Updated. * db2/db/db_conv.c: Updated. * db2/db/db_dup.c: Updated. * db2/db/db_pr.c: Updated. * db2/db/db_ret.c: Updated. * db2/db185/db185.c: Updated. * db2/dbm/dbm.c: Updated. * db2/hash/hash_dup.c: Updated. * db2/include/db_am.h: Updated. * db2/include/db_page.h: Updated. * db2/include/mp.h: Updated. * db2/include/queue.h: Updated. * db2/log/log.c: Updated. * db2/log/log_findckp.c: Updated. * db2/log/log_get.c: Updated. * db2/log/log_rec.c: Updated. * db2/mp/mp_bh.c: Updated. * db2/mp/mp_fopen.c: Updated. * db2/mp/mp_pr.c: Updated. * db2/mp/mp_sync.c: Updated. * db2/mutex/x86.gcc: Updated. * db2/os/db_os_dir.c: Updated. * db2/os/db_os_fid.c: Updated. * db2/progs/db_archive/db_archive.c: Updated. * db2/progs/db_checkpoint/db_checkpoint.c: Updated. * db2/progs/db_deadlock/db_deadlock.c: Updated. * db2/progs/db_dump/db_dump.c: Updated. * db2/progs/db_dump185/db_dump185.c: Updated. * db2/progs/db_load/db_load.c: Updated. * db2/progs/db_printlog/db_printlog.c: Updated. * db2/progs/db_recover/db_recover.c: Updated. * db2/progs/db_stat/db_stat.c: Updated. * db2/txn/txn.c: Updated. * db2/txn/txn_rec.c: Updated. * db2/Makefile: Add rule to build db_printlog. * db2/config.h: Don't include endian.h and don't define WORDS_BIGENDIAN. Only define HAVE_ENDIAN_H. * elf/dl-open.c (_dl_open): Make thread-safe. * elf/dl-close.c (_dl_close): Likewise. * elf/dlclose.c: Pretty print. * elf/dl-version.c (make_string): Use __strdup not strdup. (find_needed): Don't use l_searchlist of _dl_loaded, use the l_next list. * elf/dl-deps.c (_dl_map_object_deps): Remove variable head. * manual/math.texi: Add note about == and != for FP values. * manual/message.texi: Mention problems with relative paths and binstextdomain. * manual/string.texi: Mark strdupa and strndupa correctly as macros. * sunrpc/Makefile (CFLAGS-xkey_prot.c): Define to prevent warnings. * sunrpc/rpc_cout.c: Avoid needless races around return value. * sysdeps/generic/stpcpy.c: Include <config.h> if wanted. Update from tzdata-1997h. * time/africa: Updated. * time/europe: Updated. * time/iso3166.tab: Updated. * time/northamerica: Updated. * time/southamerica: Updated. * time/zone.tab: Updated. 1997-09-04 13:19 Richard Henderson <rth@cygnus.com> * sysdeps/alpha/w_sqrt.S: Removed. * sysdeps/alpha/fpu/e_sqrt.c: New. Obey -mieee and -mieee-with-inexact and build a version that is as fast as possible given the constraint. 1997-08-30 Andreas Jaeger <aj@arthur.rhein-neckar.de> * manual/maint.texi: Document some defaults for configuration parameters. 1997-09-04 15:57 Ulrich Drepper <drepper@cygnus.com> * termios/cfsetspeed.c (cfsetspeed): Change return value to int. * termios/termios.h: Change prototype accordingly. Reported by Andreas Jaeger <aj@arthur.rhein-neckar.de>. 1997-07-26 14:42 H.J. Lu <hjl@gnu.ai.mit.edu> * libio/stdfiles.c (_libio_using_thunks): Define if _G_USING_THUNKS is defined. * libio/_G_config.h: Moved to ... * sysdeps/generic/_G_config.h: ...here. * sysdeps/unix/sysv/linux/_G_config.h: New, Add vtable thunks support. 1997-09-02 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/m68k/Makefile (pic-ccflag): Override it for more efficient code (together with a change in gcc). * Makeconfig (pic-ccflag): New variable. (CFLAGS-.os): Use it instead of hardcoding -fPIC. 1997-09-02 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/m68k/dl-machine.h (elf_machine_load_address): Use _dl_start instead of a local label, to avoid getting an unreadable label name. 1997-09-02 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * nss/Makefile ($(objpfx)libnss_db.so): Use $(dbobjdir) to find libdb.so. * Makeconfig (dbobjdir): Use db2. 1997-08-31 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * manual/maint.texi (Porting to Unix): Update description of the implementation of Unix system calls. (Contributors): Use real umlaut in tege's name. 1997-08-30 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/libm-ieee754/w_gamma.c: Make compilable with _IEEE_LIBM. * sysdeps/libm-ieee754/w_gammaf.c: Likewise. * sysdeps/libm-ieee754/w_gammal.c: Likewise.
489 lines
11 KiB
C
489 lines
11 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_bh.c 10.15 (Sleepycat) 8/29/97";
|
|
#endif /* not lint */
|
|
|
|
#ifndef NO_SYSTEM_INCLUDES
|
|
#include <sys/types.h>
|
|
|
|
#include <errno.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"
|
|
|
|
static int __memp_upgrade __P((DB_MPOOL *, DB_MPOOLFILE *, MPOOLFILE *));
|
|
|
|
/*
|
|
* __memp_bhwrite --
|
|
* Write the page associated with a given bucket header.
|
|
*
|
|
* PUBLIC: int __memp_bhwrite
|
|
* PUBLIC: __P((DB_MPOOL *, MPOOLFILE *, BH *, int *, int *));
|
|
*/
|
|
int
|
|
__memp_bhwrite(dbmp, mfp, bhp, restartp, wrotep)
|
|
DB_MPOOL *dbmp;
|
|
MPOOLFILE *mfp;
|
|
BH *bhp;
|
|
int *restartp, *wrotep;
|
|
{
|
|
DBT dbt;
|
|
DB_MPOOLFILE *dbmfp;
|
|
DB_MPREG *mpreg;
|
|
|
|
if (restartp != NULL)
|
|
*restartp = 0;
|
|
if (wrotep != NULL)
|
|
*wrotep = 0;
|
|
|
|
/*
|
|
* Walk the process' DB_MPOOLFILE list and find a file descriptor for
|
|
* the file. We also check that the descriptor is open for writing.
|
|
* If we find a descriptor on the file that's not open for writing, we
|
|
* try and upgrade it to make it writeable.
|
|
*/
|
|
LOCKHANDLE(dbmp, &dbmp->mutex);
|
|
for (dbmfp = TAILQ_FIRST(&dbmp->dbmfq);
|
|
dbmfp != NULL; dbmfp = TAILQ_NEXT(dbmfp, q))
|
|
if (dbmfp->mfp == mfp) {
|
|
if (F_ISSET(dbmfp, MP_READONLY) &&
|
|
__memp_upgrade(dbmp, dbmfp, mfp))
|
|
return (0);
|
|
break;
|
|
}
|
|
UNLOCKHANDLE(dbmp, &dbmp->mutex);
|
|
if (dbmfp != NULL)
|
|
goto found;
|
|
|
|
/*
|
|
* It's not a page from a file we've opened. If the file requires
|
|
* input/output processing, see if this process has ever registered
|
|
* information as to how to write this type of file. If not, there's
|
|
* nothing we can do.
|
|
*/
|
|
if (mfp->ftype != 0) {
|
|
LOCKHANDLE(dbmp, &dbmp->mutex);
|
|
for (mpreg = LIST_FIRST(&dbmp->dbregq);
|
|
mpreg != NULL; mpreg = LIST_NEXT(mpreg, q))
|
|
if (mpreg->ftype == mfp->ftype)
|
|
break;
|
|
UNLOCKHANDLE(dbmp, &dbmp->mutex);
|
|
if (mpreg == NULL)
|
|
return (0);
|
|
}
|
|
|
|
/*
|
|
* Try and open the file; ignore any error, assume it's a permissions
|
|
* problem.
|
|
*
|
|
* XXX
|
|
* There's no negative cache here, so we may repeatedly try and open
|
|
* files that we have previously tried (and failed) to open.
|
|
*/
|
|
dbt.size = mfp->pgcookie_len;
|
|
dbt.data = ADDR(dbmp, mfp->pgcookie_off);
|
|
if (__memp_fopen(dbmp, ADDR(dbmp, mfp->path_off),
|
|
mfp->ftype, 0, 0, mfp->stat.st_pagesize,
|
|
mfp->lsn_off, &dbt, ADDR(dbmp, mfp->fileid_off), 0, &dbmfp) != 0)
|
|
return (0);
|
|
|
|
found: return (__memp_pgwrite(dbmfp, bhp, restartp, wrotep));
|
|
}
|
|
|
|
/*
|
|
* __memp_pgread --
|
|
* Read a page from a file.
|
|
*
|
|
* PUBLIC: int __memp_pgread __P((DB_MPOOLFILE *, BH *, int));
|
|
*/
|
|
int
|
|
__memp_pgread(dbmfp, bhp, can_create)
|
|
DB_MPOOLFILE *dbmfp;
|
|
BH *bhp;
|
|
int can_create;
|
|
{
|
|
DB_MPOOL *dbmp;
|
|
MPOOLFILE *mfp;
|
|
size_t pagesize;
|
|
ssize_t nr;
|
|
int ret;
|
|
|
|
dbmp = dbmfp->dbmp;
|
|
mfp = dbmfp->mfp;
|
|
pagesize = mfp->stat.st_pagesize;
|
|
|
|
F_SET(bhp, BH_LOCKED | BH_TRASH);
|
|
LOCKBUFFER(dbmp, bhp);
|
|
UNLOCKREGION(dbmp);
|
|
|
|
/*
|
|
* Temporary files may not yet have been created.
|
|
*
|
|
* Seek to the page location.
|
|
*/
|
|
ret = 0;
|
|
LOCKHANDLE(dbmp, &dbmfp->mutex);
|
|
if (dbmfp->fd == -1 || (ret =
|
|
__db_lseek(dbmfp->fd, pagesize, bhp->pgno, 0, SEEK_SET)) != 0) {
|
|
if (!can_create) {
|
|
if (dbmfp->fd == -1)
|
|
ret = EINVAL;
|
|
UNLOCKHANDLE(dbmp, &dbmfp->mutex);
|
|
__db_err(dbmp->dbenv,
|
|
"%s: page %lu doesn't exist, create flag not set",
|
|
dbmfp->path, (u_long)bhp->pgno);
|
|
goto err;
|
|
}
|
|
UNLOCKHANDLE(dbmp, &dbmfp->mutex);
|
|
|
|
/* Clear any uninitialized data. */
|
|
memset(bhp->buf, 0, pagesize);
|
|
goto pgin;
|
|
}
|
|
|
|
/*
|
|
* Read the page; short reads are treated like creates, although
|
|
* any valid data is preserved.
|
|
*/
|
|
ret = __db_read(dbmfp->fd, bhp->buf, pagesize, &nr);
|
|
UNLOCKHANDLE(dbmp, &dbmfp->mutex);
|
|
if (ret != 0)
|
|
goto err;
|
|
|
|
if (nr == (ssize_t)pagesize)
|
|
can_create = 0;
|
|
else {
|
|
if (!can_create) {
|
|
ret = EINVAL;
|
|
goto err;
|
|
}
|
|
|
|
/* Clear any uninitialized data. */
|
|
memset(bhp->buf + nr, 0, pagesize - nr);
|
|
}
|
|
|
|
/* Call any pgin function. */
|
|
pgin: ret = mfp->ftype == 0 ? 0 : __memp_pg(dbmfp, bhp, 1);
|
|
|
|
/* Reacquire the region lock. */
|
|
LOCKREGION(dbmp);
|
|
|
|
/* If the pgin function succeeded, the data is now valid. */
|
|
if (ret == 0)
|
|
F_CLR(bhp, BH_TRASH);
|
|
|
|
/* Update the statistics. */
|
|
if (can_create) {
|
|
++dbmp->mp->stat.st_page_create;
|
|
++mfp->stat.st_page_create;
|
|
} else {
|
|
++dbmp->mp->stat.st_page_in;
|
|
++mfp->stat.st_page_in;
|
|
}
|
|
|
|
if (0) {
|
|
err: LOCKREGION(dbmp);
|
|
}
|
|
|
|
/* Release the buffer. */
|
|
F_CLR(bhp, BH_LOCKED);
|
|
UNLOCKBUFFER(dbmp, bhp);
|
|
|
|
return (ret);
|
|
}
|
|
|
|
/*
|
|
* __memp_pgwrite --
|
|
* Write a page to a file.
|
|
*
|
|
* PUBLIC: int __memp_pgwrite __P((DB_MPOOLFILE *, BH *, int *, int *));
|
|
*/
|
|
int
|
|
__memp_pgwrite(dbmfp, bhp, restartp, wrotep)
|
|
DB_MPOOLFILE *dbmfp;
|
|
BH *bhp;
|
|
int *restartp, *wrotep;
|
|
{
|
|
DB_ENV *dbenv;
|
|
DB_LOG *lg_info;
|
|
DB_LSN lsn;
|
|
DB_MPOOL *dbmp;
|
|
MPOOL *mp;
|
|
MPOOLFILE *mfp;
|
|
size_t pagesize;
|
|
ssize_t nw;
|
|
int callpgin, ret;
|
|
const char *fail;
|
|
|
|
dbmp = dbmfp->dbmp;
|
|
dbenv = dbmp->dbenv;
|
|
mfp = dbmfp->mfp;
|
|
|
|
if (restartp != NULL)
|
|
*restartp = 0;
|
|
if (wrotep != NULL)
|
|
*wrotep = 0;
|
|
callpgin = 0;
|
|
pagesize = mfp->stat.st_pagesize;
|
|
|
|
F_SET(bhp, BH_LOCKED);
|
|
LOCKBUFFER(dbmp, bhp);
|
|
UNLOCKREGION(dbmp);
|
|
|
|
if (restartp != NULL)
|
|
*restartp = 1;
|
|
|
|
/* Copy the LSN off the page if we're going to need it. */
|
|
lg_info = dbenv->lg_info;
|
|
if (lg_info != NULL || F_ISSET(bhp, BH_WRITE))
|
|
memcpy(&lsn, bhp->buf + mfp->lsn_off, sizeof(DB_LSN));
|
|
|
|
/* Ensure the appropriate log records are on disk. */
|
|
if (lg_info != NULL && (ret = log_flush(lg_info, &lsn)) != 0)
|
|
goto err;
|
|
|
|
/*
|
|
* Call any pgout function. We set the callpgin flag so that on
|
|
* error we flag that the contents of the buffer may be trash.
|
|
*/
|
|
if (mfp->ftype == 0)
|
|
ret = 0;
|
|
else {
|
|
callpgin = 1;
|
|
if ((ret = __memp_pg(dbmfp, bhp, 0)) != 0)
|
|
goto err;
|
|
}
|
|
|
|
/* Temporary files may not yet have been created. */
|
|
LOCKHANDLE(dbmp, &dbmfp->mutex);
|
|
if (dbmfp->fd == -1 && ((ret = __db_appname(dbenv, DB_APP_TMP,
|
|
NULL, NULL, &dbmfp->fd, NULL)) != 0 || dbmfp->fd == -1)) {
|
|
UNLOCKHANDLE(dbmp, &dbmfp->mutex);
|
|
__db_err(dbenv, "unable to create temporary backing file");
|
|
goto err;
|
|
}
|
|
|
|
/* Write the page out. */
|
|
if ((ret =
|
|
__db_lseek(dbmfp->fd, pagesize, bhp->pgno, 0, SEEK_SET)) != 0)
|
|
fail = "seek";
|
|
else if ((ret = __db_write(dbmfp->fd, bhp->buf, pagesize, &nw)) != 0)
|
|
fail = "write";
|
|
UNLOCKHANDLE(dbmp, &dbmfp->mutex);
|
|
if (ret != 0) {
|
|
/*
|
|
* XXX
|
|
* Shut the compiler up; it doesn't understand the correlation
|
|
* between the failing clauses to __db_lseek and __db_write and
|
|
* this ret != 0.
|
|
*/
|
|
fail = NULL;
|
|
goto syserr;
|
|
}
|
|
|
|
if (nw != (ssize_t)pagesize) {
|
|
ret = EIO;
|
|
fail = "write";
|
|
goto syserr;
|
|
}
|
|
|
|
if (wrotep != NULL)
|
|
*wrotep = 1;
|
|
|
|
/* Reacquire the region lock. */
|
|
LOCKREGION(dbmp);
|
|
|
|
/* Clean up the flags based on a successful write. */
|
|
F_SET(bhp, BH_CALLPGIN);
|
|
F_CLR(bhp, BH_DIRTY | BH_LOCKED);
|
|
UNLOCKBUFFER(dbmp, bhp);
|
|
|
|
/*
|
|
* If we wrote a buffer which a checkpoint is waiting for, update
|
|
* the count of pending buffers (both in the mpool as a whole and
|
|
* for this file). If the count for this file goes to zero, flush
|
|
* the writes.
|
|
*
|
|
* XXX:
|
|
* We ignore errors from the sync -- it makes no sense to return an
|
|
* error to the calling process, so set a flag causing the sync to
|
|
* be retried later.
|
|
*
|
|
* If the buffer we wrote has a LSN larger than the current largest
|
|
* we've written for this checkpoint, update the saved value.
|
|
*/
|
|
mp = dbmp->mp;
|
|
if (F_ISSET(bhp, BH_WRITE)) {
|
|
if (log_compare(&lsn, &mp->lsn) > 0)
|
|
mp->lsn = lsn;
|
|
F_CLR(bhp, BH_WRITE);
|
|
|
|
--mp->lsn_cnt;
|
|
if (--mfp->lsn_cnt == 0) {
|
|
/*
|
|
* Don't lock -- there are no atomicity issues for
|
|
* fsync(2).
|
|
*/
|
|
if (__db_fsync(dbmfp->fd) != 0)
|
|
F_SET(mp, MP_LSN_RETRY);
|
|
}
|
|
}
|
|
|
|
/* Update I/O statistics. */
|
|
++mp->stat.st_page_out;
|
|
++mfp->stat.st_page_out;
|
|
|
|
return (0);
|
|
|
|
syserr: __db_err(dbenv,
|
|
"%s: %s failed for page %lu", dbmfp->path, fail, (u_long)bhp->pgno);
|
|
|
|
err: UNLOCKBUFFER(dbmp, bhp);
|
|
LOCKREGION(dbmp);
|
|
if (callpgin)
|
|
F_SET(bhp, BH_CALLPGIN);
|
|
F_CLR(bhp, BH_LOCKED);
|
|
return (ret);
|
|
}
|
|
|
|
/*
|
|
* __memp_pg --
|
|
* Call the pgin/pgout routine.
|
|
*
|
|
* PUBLIC: int __memp_pg __P((DB_MPOOLFILE *, BH *, int));
|
|
*/
|
|
int
|
|
__memp_pg(dbmfp, bhp, is_pgin)
|
|
DB_MPOOLFILE *dbmfp;
|
|
BH *bhp;
|
|
int is_pgin;
|
|
{
|
|
DBT dbt, *dbtp;
|
|
DB_MPOOL *dbmp;
|
|
DB_MPREG *mpreg;
|
|
MPOOLFILE *mfp;
|
|
int ftype, ret;
|
|
|
|
dbmp = dbmfp->dbmp;
|
|
mfp = dbmfp->mfp;
|
|
|
|
LOCKHANDLE(dbmp, &dbmp->mutex);
|
|
|
|
ftype = mfp->ftype;
|
|
for (mpreg = LIST_FIRST(&dbmp->dbregq);
|
|
mpreg != NULL; mpreg = LIST_NEXT(mpreg, q)) {
|
|
if (ftype != mpreg->ftype)
|
|
continue;
|
|
if (mfp->pgcookie_len == 0)
|
|
dbtp = NULL;
|
|
else {
|
|
dbt.size = mfp->pgcookie_len;
|
|
dbt.data = ADDR(dbmp, mfp->pgcookie_off);
|
|
dbtp = &dbt;
|
|
}
|
|
UNLOCKHANDLE(dbmp, &dbmp->mutex);
|
|
|
|
if (is_pgin) {
|
|
if (mpreg->pgin != NULL && (ret =
|
|
mpreg->pgin(bhp->pgno, bhp->buf, dbtp)) != 0)
|
|
goto err;
|
|
} else
|
|
if (mpreg->pgout != NULL && (ret =
|
|
mpreg->pgout(bhp->pgno, bhp->buf, dbtp)) != 0)
|
|
goto err;
|
|
break;
|
|
}
|
|
|
|
if (mpreg == NULL)
|
|
UNLOCKHANDLE(dbmp, &dbmp->mutex);
|
|
|
|
return (0);
|
|
|
|
err: UNLOCKHANDLE(dbmp, &dbmp->mutex);
|
|
__db_err(dbmp->dbenv, "%s: %s failed for page %lu",
|
|
dbmfp->path, is_pgin ? "pgin" : "pgout", (u_long)bhp->pgno);
|
|
return (ret);
|
|
}
|
|
|
|
/*
|
|
* __memp_bhfree --
|
|
* Free a bucket header and its referenced data.
|
|
*
|
|
* PUBLIC: void __memp_bhfree __P((DB_MPOOL *, MPOOLFILE *, BH *, int));
|
|
*/
|
|
void
|
|
__memp_bhfree(dbmp, mfp, bhp, free_mem)
|
|
DB_MPOOL *dbmp;
|
|
MPOOLFILE *mfp;
|
|
BH *bhp;
|
|
int free_mem;
|
|
{
|
|
size_t off;
|
|
|
|
/* Delete the buffer header from the MPOOL hash list. */
|
|
off = BUCKET(dbmp->mp, OFFSET(dbmp, mfp), bhp->pgno);
|
|
SH_TAILQ_REMOVE(&dbmp->htab[off], bhp, mq, __bh);
|
|
|
|
/* Delete the buffer header from the LRU chain. */
|
|
SH_TAILQ_REMOVE(&dbmp->mp->bhq, bhp, q, __bh);
|
|
|
|
/*
|
|
* If we're not reusing it immediately, free the buffer header
|
|
* and data for real.
|
|
*/
|
|
if (free_mem)
|
|
__db_shalloc_free(dbmp->addr, bhp);
|
|
}
|
|
|
|
/*
|
|
* __memp_upgrade --
|
|
* Upgrade a file descriptor from readonly to readwrite.
|
|
*/
|
|
static int
|
|
__memp_upgrade(dbmp, dbmfp, mfp)
|
|
DB_MPOOL *dbmp;
|
|
DB_MPOOLFILE *dbmfp;
|
|
MPOOLFILE *mfp;
|
|
{
|
|
int fd;
|
|
|
|
/*
|
|
* !!!
|
|
* We expect the handle to already be locked.
|
|
*/
|
|
|
|
/* Check to see if we've already upgraded. */
|
|
if (F_ISSET(dbmfp, MP_UPGRADE))
|
|
return (0);
|
|
|
|
/* Check to see if we've already failed. */
|
|
if (F_ISSET(dbmfp, MP_UPGRADE_FAIL))
|
|
return (1);
|
|
|
|
/* Try the open. */
|
|
if (__db_fdopen(ADDR(dbmp, mfp->path_off), 0, 0, 0, &fd) != 0) {
|
|
F_SET(dbmfp, MP_UPGRADE_FAIL);
|
|
return (1);
|
|
}
|
|
|
|
/* Swap the descriptors and set the upgrade flag. */
|
|
(void)close(dbmfp->fd);
|
|
dbmfp->fd = fd;
|
|
F_SET(dbmfp, MP_UPGRADE);
|
|
|
|
return (0);
|
|
}
|