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.
122 lines
2.6 KiB
C
122 lines
2.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[] = "@(#)db_thread.c 8.15 (Sleepycat) 4/26/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 "db_am.h"
|
|
|
|
static int __db_getlockid __P((DB *, DB *));
|
|
|
|
/*
|
|
* __db_gethandle --
|
|
* Called by db access method routines when the DB_THREAD flag is set.
|
|
* This routine returns a handle, either an existing handle from the
|
|
* chain of handles, or creating one if necessary.
|
|
*
|
|
* PUBLIC: int __db_gethandle __P((DB *, int (*)(DB *, DB *), DB **));
|
|
*/
|
|
int
|
|
__db_gethandle(dbp, am_func, dbpp)
|
|
DB *dbp, **dbpp;
|
|
int (*am_func) __P((DB *, DB *));
|
|
{
|
|
DB *ret_dbp;
|
|
int ret, t_ret;
|
|
|
|
if ((ret = __db_mutex_lock((db_mutex_t *)dbp->mutexp, -1)) != 0)
|
|
return (ret);
|
|
|
|
if ((ret_dbp = LIST_FIRST(&dbp->handleq)) != NULL)
|
|
/* Simply take one off the list. */
|
|
LIST_REMOVE(ret_dbp, links);
|
|
else {
|
|
/* Allocate a new handle. */
|
|
if ((ret_dbp = (DB *)__db_malloc(sizeof(*dbp))) == NULL) {
|
|
ret = ENOMEM;
|
|
goto err;
|
|
}
|
|
memcpy(ret_dbp, dbp, sizeof(*dbp));
|
|
ret_dbp->internal = NULL;
|
|
TAILQ_INIT(&ret_dbp->curs_queue);
|
|
|
|
/* Set the locker, the lock structure and the lock DBT. */
|
|
if ((ret = __db_getlockid(dbp, ret_dbp)) != 0)
|
|
goto err;
|
|
|
|
/* Finally, call the access method specific dup function. */
|
|
if ((ret = am_func(dbp, ret_dbp)) != 0)
|
|
goto err;
|
|
}
|
|
|
|
*dbpp = ret_dbp;
|
|
|
|
if (0) {
|
|
err: if (ret_dbp != NULL)
|
|
FREE(ret_dbp, sizeof(*ret_dbp));
|
|
}
|
|
if ((t_ret =
|
|
__db_mutex_unlock((db_mutex_t *)dbp->mutexp, -1)) != 0 && ret == 0)
|
|
ret = t_ret;
|
|
return (ret);
|
|
}
|
|
|
|
/*
|
|
* __db_puthandle --
|
|
* Return a DB handle to the pool for later use.
|
|
*
|
|
* PUBLIC: int __db_puthandle __P((DB *));
|
|
*/
|
|
int
|
|
__db_puthandle(dbp)
|
|
DB *dbp;
|
|
{
|
|
DB *master;
|
|
int ret;
|
|
|
|
master = dbp->master;
|
|
if ((ret = __db_mutex_lock((db_mutex_t *)master->mutexp, -1)) != 0)
|
|
return (ret);
|
|
|
|
LIST_INSERT_HEAD(&master->handleq, dbp, links);
|
|
|
|
return (__db_mutex_unlock((db_mutex_t *)master->mutexp, -1));
|
|
}
|
|
|
|
/*
|
|
* __db_getlockid --
|
|
* Create a new locker ID and copy the file lock information from
|
|
* the old DB into the new one.
|
|
*/
|
|
static int
|
|
__db_getlockid(dbp, new_dbp)
|
|
DB *dbp, *new_dbp;
|
|
{
|
|
int ret;
|
|
|
|
if (F_ISSET(dbp, DB_AM_LOCKING)) {
|
|
if ((ret = lock_id(dbp->dbenv->lk_info, &new_dbp->locker)) != 0)
|
|
return (ret);
|
|
memcpy(new_dbp->lock.fileid, dbp->lock.fileid, DB_FILE_ID_LEN);
|
|
new_dbp->lock_dbt.size = sizeof(new_dbp->lock);
|
|
new_dbp->lock_dbt.data = &new_dbp->lock;
|
|
}
|
|
return (0);
|
|
}
|