mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-29 22:11:18 +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.
153 lines
3.9 KiB
C
153 lines
3.9 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[] = "@(#)lock_util.c 10.9 (Sleepycat) 4/26/98";
|
|
#endif /* not lint */
|
|
|
|
#ifndef NO_SYSTEM_INCLUDES
|
|
#include <sys/types.h>
|
|
|
|
#include <string.h>
|
|
#endif
|
|
|
|
#include "db_int.h"
|
|
#include "shqueue.h"
|
|
#include "db_page.h"
|
|
#include "db_shash.h"
|
|
#include "hash.h"
|
|
#include "lock.h"
|
|
|
|
/*
|
|
* __lock_cmp --
|
|
* This function is used to compare a DBT that is about to be entered
|
|
* into a hash table with an object already in the hash table. Note
|
|
* that it just returns true on equal and 0 on not-equal. Therefore
|
|
* this function cannot be used as a sort function; its purpose is to
|
|
* be used as a hash comparison function.
|
|
*
|
|
* PUBLIC: int __lock_cmp __P((const DBT *, DB_LOCKOBJ *));
|
|
*/
|
|
int
|
|
__lock_cmp(dbt, lock_obj)
|
|
const DBT *dbt;
|
|
DB_LOCKOBJ *lock_obj;
|
|
{
|
|
void *obj_data;
|
|
|
|
if (lock_obj->type != DB_LOCK_OBJTYPE)
|
|
return (0);
|
|
|
|
obj_data = SH_DBT_PTR(&lock_obj->lockobj);
|
|
return (dbt->size == lock_obj->lockobj.size &&
|
|
memcmp(dbt->data, obj_data, dbt->size) == 0);
|
|
}
|
|
|
|
/*
|
|
* PUBLIC: int __lock_locker_cmp __P((u_int32_t, DB_LOCKOBJ *));
|
|
*/
|
|
int
|
|
__lock_locker_cmp(locker, lock_obj)
|
|
u_int32_t locker;
|
|
DB_LOCKOBJ *lock_obj;
|
|
{
|
|
void *obj_data;
|
|
|
|
if (lock_obj->type != DB_LOCK_LOCKER)
|
|
return (0);
|
|
|
|
obj_data = SH_DBT_PTR(&lock_obj->lockobj);
|
|
return (memcmp(&locker, obj_data, sizeof(u_int32_t)) == 0);
|
|
}
|
|
|
|
/*
|
|
* The next two functions are the hash functions used to store objects in the
|
|
* lock hash table. They are hashing the same items, but one (__lock_ohash)
|
|
* takes a DBT (used for hashing a parameter passed from the user) and the
|
|
* other (__lock_lhash) takes a DB_LOCKOBJ (used for hashing something that is
|
|
* already in the lock manager). In both cases, we have a special check to
|
|
* fast path the case where we think we are doing a hash on a DB page/fileid
|
|
* pair. If the size is right, then we do the fast hash.
|
|
*
|
|
* We know that DB uses struct __db_ilocks for its lock objects. The first
|
|
* four bytes are the 4-byte page number and the next DB_FILE_ID_LEN bytes
|
|
* are a unique file id, where the first 4 bytes on UNIX systems are the file
|
|
* inode number, and the first 4 bytes on Windows systems are the FileIndexLow
|
|
* bytes. So, we use the XOR of the page number and the first four bytes of
|
|
* the file id to produce a 32-bit hash value.
|
|
*
|
|
* We have no particular reason to believe that this algorithm will produce
|
|
* a good hash, but we want a fast hash more than we want a good one, when
|
|
* we're coming through this code path.
|
|
*/
|
|
#define FAST_HASH(P) { \
|
|
u_int32_t __h; \
|
|
u_int8_t *__cp, *__hp; \
|
|
__hp = (u_int8_t *)&__h; \
|
|
__cp = (u_int8_t *)(P); \
|
|
__hp[0] = __cp[0] ^ __cp[4]; \
|
|
__hp[1] = __cp[1] ^ __cp[5]; \
|
|
__hp[2] = __cp[2] ^ __cp[6]; \
|
|
__hp[3] = __cp[3] ^ __cp[7]; \
|
|
return (__h); \
|
|
}
|
|
|
|
/*
|
|
* __lock_ohash --
|
|
*
|
|
* PUBLIC: u_int32_t __lock_ohash __P((const DBT *));
|
|
*/
|
|
u_int32_t
|
|
__lock_ohash(dbt)
|
|
const DBT *dbt;
|
|
{
|
|
if (dbt->size == sizeof(struct __db_ilock))
|
|
FAST_HASH(dbt->data);
|
|
|
|
return (__ham_func5(dbt->data, dbt->size));
|
|
}
|
|
|
|
/*
|
|
* __lock_lhash --
|
|
*
|
|
* PUBLIC: u_int32_t __lock_lhash __P((DB_LOCKOBJ *));
|
|
*/
|
|
u_int32_t
|
|
__lock_lhash(lock_obj)
|
|
DB_LOCKOBJ *lock_obj;
|
|
{
|
|
u_int32_t tmp;
|
|
void *obj_data;
|
|
|
|
obj_data = SH_DBT_PTR(&lock_obj->lockobj);
|
|
if (lock_obj->type == DB_LOCK_LOCKER) {
|
|
memcpy(&tmp, obj_data, sizeof(u_int32_t));
|
|
return (tmp);
|
|
}
|
|
|
|
if (lock_obj->lockobj.size == sizeof(struct __db_ilock))
|
|
FAST_HASH(obj_data);
|
|
|
|
return (__ham_func5(obj_data, lock_obj->lockobj.size));
|
|
}
|
|
|
|
/*
|
|
* __lock_locker_hash --
|
|
* Hash function for entering lockers into the hash table. Since these
|
|
* are simply 32-bit unsigned integers, just return the locker value.
|
|
*
|
|
* PUBLIC: u_int32_t __lock_locker_hash __P((u_int32_t));
|
|
*/
|
|
u_int32_t
|
|
__lock_locker_hash(locker)
|
|
u_int32_t locker;
|
|
{
|
|
return (locker);
|
|
}
|