mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-14 23:30:06 +00: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.
203 lines
4.4 KiB
C
203 lines
4.4 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_open.c 10.23 (Sleepycat) 5/3/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_open --
|
|
* Initialize and/or join a memory pool.
|
|
*/
|
|
int
|
|
memp_open(path, flags, mode, dbenv, retp)
|
|
const char *path;
|
|
u_int32_t flags;
|
|
int mode;
|
|
DB_ENV *dbenv;
|
|
DB_MPOOL **retp;
|
|
{
|
|
DB_MPOOL *dbmp;
|
|
size_t cachesize;
|
|
int is_private, ret;
|
|
|
|
/* Validate arguments. */
|
|
#ifdef HAVE_SPINLOCKS
|
|
#define OKFLAGS (DB_CREATE | DB_MPOOL_PRIVATE | DB_NOMMAP | DB_THREAD)
|
|
#else
|
|
#define OKFLAGS (DB_CREATE | DB_MPOOL_PRIVATE | DB_NOMMAP)
|
|
#endif
|
|
if ((ret = __db_fchk(dbenv, "memp_open", flags, OKFLAGS)) != 0)
|
|
return (ret);
|
|
|
|
/* Extract fields from DB_ENV structure. */
|
|
cachesize = dbenv == NULL ? 0 : dbenv->mp_size;
|
|
|
|
/* Create and initialize the DB_MPOOL structure. */
|
|
if ((dbmp = (DB_MPOOL *)__db_calloc(1, sizeof(DB_MPOOL))) == NULL)
|
|
return (ENOMEM);
|
|
LIST_INIT(&dbmp->dbregq);
|
|
TAILQ_INIT(&dbmp->dbmfq);
|
|
|
|
dbmp->dbenv = dbenv;
|
|
|
|
/* Decide if it's possible for anyone else to access the pool. */
|
|
is_private =
|
|
(dbenv == NULL && path == NULL) || LF_ISSET(DB_MPOOL_PRIVATE);
|
|
|
|
/*
|
|
* Map in the region. We do locking regardless, as portions of it are
|
|
* implemented in common code (if we put the region in a file, that is).
|
|
*/
|
|
F_SET(dbmp, MP_LOCKREGION);
|
|
if ((ret = __memp_ropen(dbmp,
|
|
path, cachesize, mode, is_private, LF_ISSET(DB_CREATE))) != 0)
|
|
goto err;
|
|
F_CLR(dbmp, MP_LOCKREGION);
|
|
|
|
/*
|
|
* If there's concurrent access, then we have to lock the region.
|
|
* If it's threaded, then we have to lock both the handles and the
|
|
* region, and we need to allocate a mutex for that purpose.
|
|
*/
|
|
if (!is_private)
|
|
F_SET(dbmp, MP_LOCKREGION);
|
|
if (LF_ISSET(DB_THREAD)) {
|
|
F_SET(dbmp, MP_LOCKHANDLE | MP_LOCKREGION);
|
|
LOCKREGION(dbmp);
|
|
ret = __memp_ralloc(dbmp,
|
|
sizeof(db_mutex_t), NULL, &dbmp->mutexp);
|
|
UNLOCKREGION(dbmp);
|
|
if (ret != 0) {
|
|
(void)memp_close(dbmp);
|
|
goto err;
|
|
}
|
|
LOCKINIT(dbmp, dbmp->mutexp);
|
|
}
|
|
|
|
*retp = dbmp;
|
|
return (0);
|
|
|
|
err: if (dbmp != NULL)
|
|
FREE(dbmp, sizeof(DB_MPOOL));
|
|
return (ret);
|
|
}
|
|
|
|
/*
|
|
* memp_close --
|
|
* Close a memory pool.
|
|
*/
|
|
int
|
|
memp_close(dbmp)
|
|
DB_MPOOL *dbmp;
|
|
{
|
|
DB_MPOOLFILE *dbmfp;
|
|
DB_MPREG *mpreg;
|
|
int ret, t_ret;
|
|
|
|
ret = 0;
|
|
|
|
/* Discard DB_MPREGs. */
|
|
while ((mpreg = LIST_FIRST(&dbmp->dbregq)) != NULL) {
|
|
LIST_REMOVE(mpreg, q);
|
|
FREE(mpreg, sizeof(DB_MPREG));
|
|
}
|
|
|
|
/* Discard DB_MPOOLFILEs. */
|
|
while ((dbmfp = TAILQ_FIRST(&dbmp->dbmfq)) != NULL)
|
|
if ((t_ret = memp_fclose(dbmfp)) != 0 && ret == 0)
|
|
ret = t_ret;
|
|
|
|
/* Discard thread mutex. */
|
|
if (F_ISSET(dbmp, MP_LOCKHANDLE)) {
|
|
LOCKREGION(dbmp);
|
|
__db_shalloc_free(dbmp->addr, dbmp->mutexp);
|
|
UNLOCKREGION(dbmp);
|
|
}
|
|
|
|
/* Close the region. */
|
|
if ((t_ret = __db_rdetach(&dbmp->reginfo)) != 0 && ret == 0)
|
|
ret = t_ret;
|
|
|
|
if (dbmp->reginfo.path != NULL)
|
|
FREES(dbmp->reginfo.path);
|
|
FREE(dbmp, sizeof(DB_MPOOL));
|
|
|
|
return (ret);
|
|
}
|
|
|
|
/*
|
|
* memp_unlink --
|
|
* Exit a memory pool.
|
|
*/
|
|
int
|
|
memp_unlink(path, force, dbenv)
|
|
const char *path;
|
|
int force;
|
|
DB_ENV *dbenv;
|
|
{
|
|
REGINFO reginfo;
|
|
int ret;
|
|
|
|
memset(®info, 0, sizeof(reginfo));
|
|
reginfo.dbenv = dbenv;
|
|
reginfo.appname = DB_APP_NONE;
|
|
if (path != NULL && (reginfo.path = __db_strdup(path)) == NULL)
|
|
return (ENOMEM);
|
|
reginfo.file = DB_DEFAULT_MPOOL_FILE;
|
|
ret = __db_runlink(®info, force);
|
|
if (reginfo.path != NULL)
|
|
FREES(reginfo.path);
|
|
return (ret);
|
|
}
|
|
|
|
/*
|
|
* memp_register --
|
|
* Register a file type's pgin, pgout routines.
|
|
*/
|
|
int
|
|
memp_register(dbmp, ftype, pgin, pgout)
|
|
DB_MPOOL *dbmp;
|
|
int ftype;
|
|
int (*pgin) __P((db_pgno_t, void *, DBT *));
|
|
int (*pgout) __P((db_pgno_t, void *, DBT *));
|
|
{
|
|
DB_MPREG *mpr;
|
|
|
|
if ((mpr = (DB_MPREG *)__db_malloc(sizeof(DB_MPREG))) == NULL)
|
|
return (ENOMEM);
|
|
|
|
mpr->ftype = ftype;
|
|
mpr->pgin = pgin;
|
|
mpr->pgout = pgout;
|
|
|
|
/*
|
|
* Insert at the head. Because we do a linear walk, we'll find
|
|
* the most recent registry in the case of multiple entries, so
|
|
* we don't have to check for multiple registries.
|
|
*/
|
|
LOCKHANDLE(dbmp, dbmp->mutexp);
|
|
LIST_INSERT_HEAD(&dbmp->dbregq, mpr, q);
|
|
UNLOCKHANDLE(dbmp, dbmp->mutexp);
|
|
|
|
return (0);
|
|
}
|