mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-03 02:11:08 +00:00
04be94a87d
1997-12-01 17:27 Ulrich Drepper <drepper@cygnus.com> * Makefile (subdirs): Add iconvdata and localedata. * iconv/gconv.h: Define UNKNOWN_10646_CHAR as error value. * iconv/gconv_conf.c (read_conf_file): Little optimization. * iconvdata/8bit-gap.c: New file. * iconvdata/8bit-generic.c: Renamed from ... * iconvdata/iso8859-generic.c: ...this. * iconvdata/configure: Removed. * iconvdata/Makefile: Add new modules and better rules. * iconvdata/iso6937.c: Minor bug fixes. * iconvdata/iso8859-1.c: Likewise. * iconvdata/t61.c: Likewise. * iconvdata/iso8859-2.c: Change to use 8bit-generic.c. Minor bug fixes. * iconvdata/iso8859-3.c: Likewise. * iconvdata/iso8859-4.c: Likewise. * iconvdata/iso8859-5.c: Likewise. * iconvdata/iso8859-6.c: Likewise. * iconvdata/iso8859-7.c: Likewise. * iconvdata/iso8859-8.c: Likewise. * iconvdata/iso8859-9.c: Likewise. * iconvdata/iso8859-10.c: Likewise. * iconvdata/ebcdic-at-de-a.c: New file. * iconvdata/ebcdic-at-de.c: New file. * iconvdata/ebcdic-ca-fr.c: New file. * iconvdata/hp-roman8.c: New file. * iconvdata/koi-8.c: New file. * iconvdata/koi8-r.c: New file. * iconvdata/koi8-h.c: New file. * iconvdata/latin-greek-1.c: New file. * iconvdata/latin-greek-1.h: New file. * iconvdata/latin-greek.c: New file. * iconvdata/latin-greek.h: New file. * iconvdata/jis0201.c: New file. * iconvdata/jis0201.h: New file. * iconvdata/jis0208.c: New file. * iconvdata/jis0208.h: New file. * iconvdata/jis0212.c: New file. * iconvdata/jis0212.h: New file. * iconvdata/sjis.c: New file. * iconvdata/gap.pl: New file. Script to generate table header. * iconvdata/gaptab.pl: New file. * iconvdata/gconv-modules: Add info about new modules. * locale/programs/charmap.c: Also examine alias names given in charmap files. * localedata/*: Add to here from add-on. We need the information to generate tables for iconv. Update from db-2.3.14. * db2/Makefile: Updated. * db2/config.h: Likewise. * db2/db.h: Likewise. * db2/db_int.h: Likewise. * db2/btree/bt_cursor.c: Likewise. * db2/btree/bt_delete.c: Likewise. * db2/btree/bt_put.c: Likewise. * db2/btree/bt_search.c: Likewise. * db2/btree/bt_split.c: Likewise. * db2/btree/btree_auto.c: Likewise. * db2/common/db_appinit.c: Likewise. * db2/common/db_apprec.c: Likewise. * db2/common/db_err.c: Likewise. * db2/common/db_region.c: Likewise. * db2/db/db_auto.c: Likewise. * db2/db/db_dispatch.c: Likewise. * db2/db/db_ret.c: Likewise. * db2/dbm/dbm.c: Likewise. * db2/hash/hash_auto.c: Likewise. * db2/include/btree_ext.h: Likewise. * db2/include/common_ext.h: Likewise. * db2/include/db.h.src: Likewise. * db2/include/db_cxx.h: Likewise. * db2/include/db_ext.h: Likewise. * db2/include/db_int.h.src: Likewise. * db2/include/lock.h: Likewise. * db2/include/log.h: Likewise. * db2/include/mp.h: Likewise. * db2/include/mp_ext.h: Likewise. * db2/include/os_ext.h: Likewise. * db2/include/os_func.h: Likewise. * db2/lock/lock.c: Likewise. * db2/lock/lock_deadlock.c: Likewise. * db2/log/log.c: Likewise. * db2/log/log_archive.c: Likewise. * db2/log/log_auto.c: Likewise. * db2/log/log_get.c: Likewise. * db2/log/log_put.c: Likewise. * db2/mp/mp_bh.c: Likewise. * db2/mp/mp_fget.c: Likewise. * db2/mp/mp_fopen.c: Likewise. * db2/mp/mp_fput.c: Likewise. * db2/mp/mp_fset.c: Likewise. * db2/mp/mp_open.c: Likewise. * db2/mp/mp_pr.c: Likewise. * db2/mp/mp_region.c: Likewise. * db2/mp/mp_sync.c: Likewise. * db2/mutex/README: Likewise. * db2/mutex/mutex.c: Likewise. * db2/os/os_open.c: Likewise. * db2/os/os_func.c: Removed. * db2/os/os_config.c: New file. * db2/os/os_spin.c: New file. * db2/txn/txn.c: Likewise. * db2/txn/txn_auto.c: Likewise. 1997-11-30 06:01 Ulrich Drepper <drepper@cygnus.com> * posix/sys/wait.h (__WAIT_INT): Don't use complex version with __typeof for C++ since this fails for class members. Reported by Neal Becker <neal@ctd.comsat.com>. 1997-11-28 11:21 Zack Weinberg <zack@rabi.phys.columbia.edu> * configure.in: Check for a working makeinfo (3.11 or better). * config.make.in: Add MAKEINFO to be substituted. * manual/Makefile: Don't update info if makeinfo is too old. 1997-11-30 05:21 Ulrich Drepper <drepper@cygnus.com> * sysdeps/alpha/setjmp.S: Define _ASM and _SETJMP_H to get definitions. * sysdeps/alpha/__longjmp.S: Likewise. * sysdeps/unix/sysv/linux/alpha/kernel_termios.h: Include <termios.h> not <bits/termios.h>. * sysdeps/unix/sysv/linux/alpha/syscalls.list: Define syscall as __llseek and make llseek and lseek64 weak aliases. * sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list: Likewise. Patches by a sun <asun@zoology.washington.edu>. 1997-11-29 19:19 Zack Weinberg <zack@rabi.phys.columbia.edu> * misc/sys/syslog.h: Delete KERNEL preprocessor conditional. * sysdeps/unix/sysv/linux/powerpc/bits/termios.h: Likewise. * sysdeps/unix/sysv/linux/sparc/bits/termios.h: Likewise. * misc/sys/syslog.h: Clean up BSD header. 1997-11-29 Andreas Jaeger <aj@arthur.rhein-neckar.de> * sysdeps/unix/sysv/linux/bits/in.h: Add changes from Linux 2.1.67. * sysdeps/libm-ieee754/s_ctan.c (__ctan): Raise invalid exception for ctan(+-inf,x). * sysdeps/libm-ieee754/s_ctanl.c (__ctanl): Likewise. * sysdeps/libm-ieee754/s_ctanf.c (__ctanf): Likewise. * math/libm-test.c (csqrt_test): Add tests for cabs, carg, ctan, csqrt (-1), ctanh(i*pi/4). 1997-11-26 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/generic/bits/confname.h: Fix comma in enumerator. 1997-11-28 13:28 Philip Blundell <Philip.Blundell@pobox.com> * sysdeps/unix/sysv/linux/net/if_arp.h: Add more ARPHRD_ constants. 1997-11-26 Andreas Jaeger <aj@arthur.rhein-neckar.de> * wcsmbs/wcrtomb.c (__wcrtomb): Remove unused variable fake. 1997-11-26 21:28 Ulrich Drepper <drepper@cygnus.com> * sysdeps/posix/getcwd.c (GETCWD_STORYGE_CLASS): Remove definition and use. Define GETCWD_RETURN_TYPE instead and use it. * sysdeps/unix/sysv/linux/getcwd.c: Define GETCWD_RETURN_TYPE instead of GETCWD_STORYGE_CLASS and put the return type and the `internal_function' in the right order for gcc 2.7.2. 1997-11-26 Andreas Jaeger <aj@arthur.rhein-neckar.de> * sysdeps/unix/sysv/linux/sys/module.h: Remove file. It's incompatible with Linux 2.1.x. Packages using modules (e.g. modutils) should/do provide their own version. Suggested by Richard Henderson. * sysdeps/unix/sysv/linux/Dist: Remove sys/module.h. * sysdeps/unix/sysv/linux/Makefile (sysdep_headers) [$(subdir)=socket]: Remove sys/module.h. * libio/stdio.h: Correct comment of sys_nerr/sys_errlist.
204 lines
6.7 KiB
C
204 lines
6.7 KiB
C
/*-
|
|
* See the file LICENSE for redistribution information.
|
|
*
|
|
* Copyright (c) 1996, 1997
|
|
* Sleepycat Software. All rights reserved.
|
|
*
|
|
* @(#)lock.h 10.10 (Sleepycat) 11/13/97
|
|
*/
|
|
|
|
typedef struct __db_lockobj DB_LOCKOBJ;
|
|
|
|
#define DB_DEFAULT_LOCK_FILE "__db_lock.share"
|
|
#define DB_LOCK_DEFAULT_N 5000
|
|
|
|
/*
|
|
* 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)->fd)
|
|
#define UNLOCK_LOCKREGION(lt) \
|
|
(void)__db_mutex_unlock(&(lt)->region->hdr.lock, (lt)->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))
|
|
|
|
/*
|
|
* The lock table is the per-process cookie returned from a lock_open call.
|
|
*/
|
|
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
|
|
|
|
struct __db_locktab {
|
|
DB_ENV *dbenv; /* Environment. */
|
|
int fd; /* mapped file descriptor */
|
|
DB_LOCKREGION *region; /* address of shared memory region */
|
|
DB_HASHTAB *hashtab; /* Beginning of hash table. */
|
|
size_t reg_size; /* last known size of lock region */
|
|
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]
|
|
|
|
/*
|
|
* Status of a lock.
|
|
*/
|
|
typedef enum {
|
|
DB_LSTAT_ABORTED, /* Lock belongs to an aborted txn. */
|
|
DB_LSTAT_ERR, /* Lock is bad. */
|
|
DB_LSTAT_FREE, /* Lock is unallocated. */
|
|
DB_LSTAT_HELD, /* Lock is currently held. */
|
|
DB_LSTAT_NOGRANT, /* Lock was not granted. */
|
|
DB_LSTAT_PENDING, /* Lock was waiting and has been
|
|
* promoted; waiting for the owner
|
|
* to run and upgrade it to held. */
|
|
DB_LSTAT_WAITING /* Lock is on the wait queue. */
|
|
} db_status_t;
|
|
|
|
/*
|
|
* 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)))
|
|
|
|
#ifdef DEBUG
|
|
#define LOCK_DEBUG_LOCKERS 0x0001
|
|
#define LOCK_DEBUG_LOCK 0x0002
|
|
#define LOCK_DEBUG_OBJ 0x0004
|
|
#define LOCK_DEBUG_CONF 0x0008
|
|
#define LOCK_DEBUG_MEM 0x0010
|
|
#define LOCK_DEBUG_BUCKET 0x0020
|
|
#define LOCK_DEBUG_OBJECTS 0x0040
|
|
#define LOCK_DEBUG_ALL 0xFFFF
|
|
|
|
#define LOCK_DEBUG_NOMUTEX 0x0100
|
|
#endif
|
|
|
|
#include "lock_ext.h"
|