mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-20 12:00: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.
178 lines
6.0 KiB
C
178 lines
6.0 KiB
C
/*-
|
|
* See the file LICENSE for redistribution information.
|
|
*
|
|
* Copyright (c) 1996, 1997, 1998
|
|
* Sleepycat Software. All rights reserved.
|
|
*
|
|
* @(#)lock.h 10.15 (Sleepycat) 5/10/98
|
|
*/
|
|
|
|
typedef struct __db_lockobj DB_LOCKOBJ;
|
|
|
|
#define DB_DEFAULT_LOCK_FILE "__db_lock.share"
|
|
|
|
#ifndef DB_LOCK_DEFAULT_N
|
|
#define DB_LOCK_DEFAULT_N 5000 /* Default # of locks in region. */
|
|
#endif
|
|
|
|
/*
|
|
* The locker id space is divided between the transaction manager and the lock
|
|
* manager. Lockid's start at 0 and go to DB_LOCK_MAXID. Txn Id's start at
|
|
* DB_LOCK_MAXID + 1 and go up to TXN_INVALID.
|
|
*/
|
|
#define DB_LOCK_MAXID 0x7fffffff
|
|
|
|
/*
|
|
* The lock region consists of:
|
|
* The DB_LOCKREGION structure (sizeof(DB_LOCKREGION)).
|
|
* The conflict matrix of nmodes * nmodes bytes (nmodes * nmodes).
|
|
* The hash table for object lookup (hashsize * sizeof(DB_OBJ *)).
|
|
* The locks themselves (maxlocks * sizeof(struct __db_lock).
|
|
* The objects being locked (maxlocks * sizeof(DB_OBJ)).
|
|
* String space to represent the DBTs that are the objects being locked.
|
|
*/
|
|
struct __db_lockregion {
|
|
RLAYOUT hdr; /* Shared region header. */
|
|
u_int32_t magic; /* lock magic number */
|
|
u_int32_t version; /* version number */
|
|
u_int32_t id; /* unique id generator */
|
|
u_int32_t need_dd; /* flag for deadlock detector */
|
|
u_int32_t detect; /* run dd on every conflict */
|
|
SH_TAILQ_HEAD(lock_header) free_locks; /* free lock header */
|
|
SH_TAILQ_HEAD(obj_header) free_objs; /* free obj header */
|
|
u_int32_t maxlocks; /* maximum number of locks in table */
|
|
u_int32_t table_size; /* size of hash table */
|
|
u_int32_t nmodes; /* number of lock modes */
|
|
u_int32_t numobjs; /* number of objects */
|
|
u_int32_t nlockers; /* number of lockers */
|
|
size_t increment; /* how much to grow region */
|
|
size_t hash_off; /* offset of hash table */
|
|
size_t mem_off; /* offset of memory region */
|
|
size_t mem_bytes; /* number of bytes in memory region */
|
|
u_int32_t nconflicts; /* number of lock conflicts */
|
|
u_int32_t nrequests; /* number of lock gets */
|
|
u_int32_t nreleases; /* number of lock puts */
|
|
u_int32_t ndeadlocks; /* number of deadlocks */
|
|
};
|
|
|
|
/* Macros to lock/unlock the region. */
|
|
#define LOCK_LOCKREGION(lt) \
|
|
(void)__db_mutex_lock(&(lt)->region->hdr.lock, (lt)->reginfo.fd)
|
|
#define UNLOCK_LOCKREGION(lt) \
|
|
(void)__db_mutex_unlock(&(lt)->region->hdr.lock, (lt)->reginfo.fd)
|
|
|
|
/*
|
|
* Since we will be keeping DBTs in shared memory, we need the equivalent
|
|
* of a DBT that will work in shared memory.
|
|
*/
|
|
typedef struct __sh_dbt {
|
|
u_int32_t size;
|
|
ssize_t off;
|
|
} SH_DBT;
|
|
|
|
#define SH_DBT_PTR(p) ((void *)(((u_int8_t *)(p)) + (p)->off))
|
|
|
|
struct __db_lockobj {
|
|
SH_DBT lockobj; /* Identifies object locked. */
|
|
SH_TAILQ_ENTRY links; /* Links for free list. */
|
|
union {
|
|
SH_TAILQ_HEAD(_wait) _waiters; /* List of waiting locks. */
|
|
u_int32_t _dd_id; /* Deadlock detector id. */
|
|
} wlinks;
|
|
union {
|
|
SH_LIST_HEAD(_held) _heldby; /* Locks held by this locker. */
|
|
SH_TAILQ_HEAD(_hold) _holders; /* List of held locks. */
|
|
} dlinks;
|
|
#define DB_LOCK_OBJTYPE 1
|
|
#define DB_LOCK_LOCKER 2
|
|
/* Allocate room in the object to
|
|
* hold typical DB lock structures
|
|
* so that we do not have to
|
|
* allocate them from shalloc. */
|
|
u_int8_t objdata[sizeof(struct __db_ilock)];
|
|
u_int8_t type; /* Real object or locker id. */
|
|
};
|
|
|
|
#define dd_id wlinks._dd_id
|
|
#define waiters wlinks._waiters
|
|
#define holders dlinks._holders
|
|
#define heldby dlinks._heldby
|
|
|
|
/*
|
|
* The lock table is the per-process cookie returned from a lock_open call.
|
|
*/
|
|
struct __db_locktab {
|
|
DB_ENV *dbenv; /* Environment. */
|
|
REGINFO reginfo; /* Region information. */
|
|
DB_LOCKREGION *region; /* Address of shared memory region. */
|
|
DB_HASHTAB *hashtab; /* Beginning of hash table. */
|
|
void *mem; /* Beginning of string space. */
|
|
u_int8_t *conflicts; /* Pointer to conflict matrix. */
|
|
};
|
|
|
|
/* Test for conflicts. */
|
|
#define CONFLICTS(T, HELD, WANTED) \
|
|
T->conflicts[HELD * T->region->nmodes + WANTED]
|
|
|
|
/*
|
|
* Resources in the lock region. Used to indicate which resource
|
|
* is running low when we need to grow the region.
|
|
*/
|
|
typedef enum {
|
|
DB_LOCK_MEM, DB_LOCK_OBJ, DB_LOCK_LOCK
|
|
} db_resource_t;
|
|
|
|
struct __db_lock {
|
|
/*
|
|
* Wait on mutex to wait on lock. You reference your own mutex with
|
|
* ID 0 and others reference your mutex with ID 1.
|
|
*/
|
|
db_mutex_t mutex;
|
|
|
|
u_int32_t holder; /* Who holds this lock. */
|
|
SH_TAILQ_ENTRY links; /* Free or holder/waiter list. */
|
|
SH_LIST_ENTRY locker_links; /* List of locks held by a locker. */
|
|
u_int32_t refcount; /* Reference count the lock. */
|
|
db_lockmode_t mode; /* What sort of lock. */
|
|
ssize_t obj; /* Relative offset of object struct. */
|
|
db_status_t status; /* Status of this lock. */
|
|
};
|
|
|
|
/*
|
|
* We cannot return pointers to the user (else we cannot easily grow regions),
|
|
* so we return offsets in the region. These must be converted to and from
|
|
* regular pointers. Always use the macros below.
|
|
*/
|
|
#define OFFSET_TO_LOCK(lt, off) \
|
|
((struct __db_lock *)((u_int8_t *)((lt)->region) + (off)))
|
|
#define LOCK_TO_OFFSET(lt, lock) \
|
|
((size_t)((u_int8_t *)(lock) - (u_int8_t *)lt->region))
|
|
#define OFFSET_TO_OBJ(lt, off) \
|
|
((DB_LOCKOBJ *)((u_int8_t *)((lt)->region) + (off)))
|
|
#define OBJ_TO_OFFSET(lt, obj) \
|
|
((size_t)((u_int8_t *)(obj) - (u_int8_t *)lt->region))
|
|
|
|
/*
|
|
* The lock header contains the region structure and the conflict matrix.
|
|
* Aligned to a large boundary because we don't know what the underlying
|
|
* type of the hash table elements are.
|
|
*/
|
|
#define LOCK_HASH_ALIGN 8
|
|
#define LOCK_HEADER_SIZE(M) \
|
|
((size_t)(sizeof(DB_LOCKREGION) + ALIGN((M * M), LOCK_HASH_ALIGN)))
|
|
|
|
/*
|
|
* For the full region, we need to add the locks, the objects, the hash table
|
|
* and the string space (which is 16 bytes per lock).
|
|
*/
|
|
#define STRING_SIZE(N) (16 * N)
|
|
|
|
#define LOCK_REGION_SIZE(M, N, H) \
|
|
(ALIGN(LOCK_HEADER_SIZE(M) + \
|
|
(H) * sizeof(DB_HASHTAB), MUTEX_ALIGNMENT) + \
|
|
(N) * ALIGN(sizeof(struct __db_lock), MUTEX_ALIGNMENT) + \
|
|
ALIGN((N) * sizeof(DB_LOCKOBJ), sizeof(size_t)) + \
|
|
ALIGN(STRING_SIZE(N), sizeof(size_t)))
|
|
|
|
#include "lock_ext.h"
|