mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-22 02:40:08 +00:00
af69217fea
1998-01-26 00:57 Ulrich Drepper <drepper@cygnus.com> * db2/Makefile (routines): Add os_alloc. * db2/db.h: Update from db-2.3.16. * db2/db_185.h: Likewise. * db2/db_int.h: Likewise. * db2/btree/bt_close.c: Likewise. * db2/btree/bt_cursor.c: Likewise. * db2/btree/bt_delete.c: Likewise. * db2/btree/bt_open.c: Likewise. * db2/btree/bt_page.c: Likewise. * db2/btree/bt_put.c: Likewise. * db2/btree/bt_rec.c: Likewise. * db2/btree/bt_recno.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/common/db_shash.c: Likewise. * db2/db/db.c: Likewise. * db2/db/db_auto.c: Likewise. * db2/db/db_conv.c: Likewise. * db2/db/db_dispatch.c: Likewise. * db2/db/db_dup.c: Likewise. * db2/db/db_pr.c: Likewise. * db2/db/db_rec.c: Likewise. * db2/db185/db185.c: Likewise. * db2/dbm/dbm.c: Likewise. * db2/hash/hash.c: Likewise. * db2/hash/hash_auto.c: Likewise. * db2/hash/hash_dup.c: Likewise. * db2/hash/hash_page.c: Likewise. * db2/hash/hash_rec.c: Likewise. * db2/include/btree_ext.h: Likewise. * db2/include/clib_ext.h: Likewise. * db2/include/common_ext.h: Likewise. * db2/include/db.h.src: Likewise. * db2/include/db_185.h.src: Likewise. * db2/include/db_am.h: Likewise. * db2/include/db_ext.h: Likewise. * db2/include/db_int.h.src: Likewise. * db2/include/hash_ext.h: Likewise. * db2/include/lock_ext.h: Likewise. * db2/include/log.h: Likewise. * db2/include/log_auto.h: Likewise. * db2/include/log_ext.h: Likewise. * db2/include/mp.h: Likewise. * db2/include/mp_ext.h: Likewise. * db2/include/mutex_ext.h: Likewise. * db2/include/os_ext.h: Likewise. * db2/include/os_func.h: Likewise. * db2/include/txn_ext.h: Likewise. * db2/lock/lock.c: Likewise. * db2/lock/lock_util.c: Likewise. * db2/log/log.c: Likewise. * db2/log/log.src: 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/log/log_rec.c: Likewise. * db2/log/log_register.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_pr.c: Likewise. * db2/mp/mp_sync.c: Likewise. * db2/mutex/mutex.c: Likewise. * db2/os/os_alloc.c: Likewise. * db2/os/os_config.c: Likewise. * db2/os/os_stat.c: Likewise. * db2/progs/db_checkpoint/db_checkpoint.c: Likewise. * db2/progs/db_deadlock/db_deadlock.c: Likewise. * db2/progs/db_load/db_load.c: Likewise. * db2/progs/db_printlog/db_printlog.c: Likewise. * db2/progs/db_recover/db_recover.c: Likewise. * db2/progs/db_stat/db_stat.c: Likewise. * db2/txn/txn.c: Likewise. * elf/dl-close.c (_dl_close): Rename inner variable named map to imap. Unmap memory blocks in reverse order of allocation. Call munmap with load address added to offset. Bug reported by Miguel de Icaza. * locale/programs/ld-collate.c (collate_end_weight): Correctly fill up weight array. * localedata/locales/cs_CZ: Update by Michael Mraka <michael@informatics.muni.cz>. * misc/sys/syslog.h: Reformat a bit. Don't declare vsyslog unless __USE_BSD. * nis/nss_compat/compat-grp.c: Correctly handle buffer overflow while reading line with fgets. * nis/nss_compat/compat-pwd.c: Likewise. * nis/nss_compat/compat-spwd.c: Likewise. * nss/nss_files/files-XXX.c: Likewise. * nss/nss_files/files-alias.c: Likewise. * shadow/fgetspent_r.c: Likewise. * string/strerror_r.c: Correct comment. Patch by Andreas Jaeger. * sysdeps/unix/sysv/linux/bits/stat.h: Define _STATBUF_ST_RDEV. * sysdeps/unix/sysv/linux/alpha/bits/stat.h: Likewise. * sysdeps/unix/sysv/linux/mips/bits/stat.h: Likewise. * sysdeps/unix/sysv/linux/i386/sys/ucontext.h: Allocate room for FP register content in ucontext_t. 1998-01-22 Andreas Jaeger <aj@arthur.rhein-neckar.de> * sysdeps/libm-ieee754/s_modfl.c (modf): Correct calculation. Patch by Markus Schoder <Markus.Schoder@dresdner-bank.de>. * math/libm-test.c (modf_test): Add more tests for modf. * sysdeps/unix/sysv/linux/sys/mman.h: Add const to mlock and munlock according to Unix98. 1998-01-25 Andreas Jaeger <aj@arthur.rhein-neckar.de> * nss/nss_files/files-network.c (LINE_PARSER): Set n_addrtype to AF_INET. 1998-01-21 07:22 H.J. Lu <hjl@gnu.org> * sysdeps/posix/ttyname.c: Handle symbolic links. * sysdeps/posix/ttyname_r.c: Ditto. 1998-01-25 19:39 Ulrich Drepper <drepper@cygnus.com> * db2/makedb.c (process_input): Write terminating \0 for value. (print_database): Simply print value string, don't use length. 1998-01-24 Andreas Jaeger <aj@arthur.rhein-neckar.de> * nss/nsswitch.c (__nss_configure_lookup): Correct test for early exit of loop. 1998-01-25 Thorsten Kukuk <kukuk@vt.uni-paderborn.de> * nis/ypclnt.c: Don't set dom_client to NULL, or we will not close all sockets. 1998-01-25 14:54 Ulrich Drepper <drepper@cygnus.com> * signal/Makefile (routines): Add sighold, sigrelse, sigignore, and sigset. * signal/sighold.c: New file. * signal/sigrelse.c: New file. * sysdeps/generic/sigignore.c: New file. * sysdeps/generic/sigset.c: New file. * sysdeps/posix/sigignore.c: New file. * sysdeps/posix/sigset.c: New file. * signal/signal.h: Add prototypes for new functions. * sysdeps/unix/sysv/linux/alpha/bits/signum.h: Define SIG_HOLD. * sysdeps/unix/sysv/linux/bits/signum.h: Likewise. * sysdeps/unix/sysv/linux/mips/bits/signum.h: Likewise. * sysdeps/unix/sysv/linux/sparc/bits/signum.h: Likewise. 1998-01-23 00:16 Tim Waugh <tim@cyberelk.demon.co.uk> * posix/wordexp.c: Added IFS field-splitting in parameter and command substitution. Fixed an IFS-related bug that caused an infinite loop. 1998-01-25 12:38 Ulrich Drepper <drepper@cygnus.com> * stdlib/Makefile (routines): Add getcontext, setcontext, makecontext, and swapcontext. * stdlib/ucontext.h: Correct prototypes. * sysdeps/generic/getcontext.c: New file. * sysdeps/generic/setcontext.c: New file. * sysdeps/generic/makecontext.c: New file. * sysdeps/generic/swapcontext.c: New file. * sysdeps/unix/sysv/linux/sparc/sparc64/Makefile: Removed. 1998-01-25 04:07 Ulrich Drepper <drepper@cygnus.com> * resource/sys/resource.h: Remove #include of ulimit.h which is not allowed by SUSv2 and not available on other systems. * sysdeps/unix/sysv/linux/ulimit.c: Include ulimit.h. * streams/Makefile: New file. * streams/stropts.h: New file. * sysdeps/generic/bits/stropts.h: New file. * sysdeps/generic/isastream.c: New file. * sysdeps/generic/getmsg.c: New file. * sysdeps/generic/getpmsg.c: New file. * sysdeps/generic/putmsg.c: New file. * sysdeps/generic/putpmsg.c: New file. * sysdeps/generic/fattach.c: New file. * sysdeps/generic/fdetach.c: New file. * sysdeps/unix/inet/Subdirs: Add streams. * sysdeps/generic/bits/types.h: Add definition of __t_scalar_t and __t_uscalar_t. * sysdeps/unix/sysv/linux/bits/types.h: Likewise. * sysdeps/unix/sysv/linux/alpha/bits/types.h: Likewise. * sysdeps/unix/sysv/linux/mips/bits/types.h: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc64/bits/types.h: Likewise. * sysdeps/mach/_strerror.c: Follow changes of generic version to handle small buffers correctly. 1998-01-24 17:31 H.J. Lu <hjl@gnu.org> * sysdeps/alpha/dl-machine.h (ELF_MACHINE_RUNTIME_TRAMPOLINE): Remove the 3rd arg and add declaration for _dl_runtime_resolve and _dl_runtime_profile. 1998-01-25 02:42 Ulrich Drepper <drepper@cygnus.com> * include/cpio.h: New file. Mainly copied from GNU cpio. * posix/Makefile (headers): Add cpio.h.
281 lines
8.9 KiB
C
281 lines
8.9 KiB
C
/*-
|
|
* See the file LICENSE for redistribution information.
|
|
*
|
|
* Copyright (c) 1996, 1997
|
|
* Sleepycat Software. All rights reserved.
|
|
*
|
|
* @(#)mp.h 10.25 (Sleepycat) 1/8/98
|
|
*/
|
|
|
|
struct __bh; typedef struct __bh BH;
|
|
struct __db_mpreg; typedef struct __db_mpreg DB_MPREG;
|
|
struct __mpool; typedef struct __mpool MPOOL;
|
|
struct __mpoolfile; typedef struct __mpoolfile MPOOLFILE;
|
|
|
|
/* Default mpool name. */
|
|
#define DB_DEFAULT_MPOOL_FILE "__db_mpool.share"
|
|
|
|
/*
|
|
* We default to 128K (16 8K pages) if the user doesn't specify, and
|
|
* require a minimum of 20K.
|
|
*/
|
|
#define DB_CACHESIZE_DEF (128 * 1024)
|
|
#define DB_CACHESIZE_MIN ( 20 * 1024)
|
|
|
|
#define INVALID 0 /* Invalid shared memory offset. */
|
|
|
|
/*
|
|
* There are three ways we do locking in the mpool code:
|
|
*
|
|
* Locking a handle mutex to provide concurrency for DB_THREAD operations.
|
|
* Locking the region mutex to provide mutual exclusion while reading and
|
|
* writing structures in the shared region.
|
|
* Locking buffer header mutexes during I/O.
|
|
*
|
|
* The first will not be further described here. We use the shared mpool
|
|
* region lock to provide mutual exclusion while reading/modifying all of
|
|
* the data structures, including the buffer headers. We use a per-buffer
|
|
* header lock to wait on buffer I/O. The order of locking is as follows:
|
|
*
|
|
* Searching for a buffer:
|
|
* Acquire the region lock.
|
|
* Find the buffer header.
|
|
* Increment the reference count (guarantee the buffer stays).
|
|
* While the BH_LOCKED flag is set (I/O is going on) {
|
|
* Release the region lock.
|
|
* Explicitly yield the processor if it's not the first pass
|
|
* through this loop, otherwise, we can simply spin because
|
|
* we'll be simply switching between the two locks.
|
|
* Request the buffer lock.
|
|
* The I/O will complete...
|
|
* Acquire the buffer lock.
|
|
* Release the buffer lock.
|
|
* Acquire the region lock.
|
|
* }
|
|
* Return the buffer.
|
|
*
|
|
* Reading/writing a buffer:
|
|
* Acquire the region lock.
|
|
* Find/create the buffer header.
|
|
* If reading, increment the reference count (guarantee the buffer stays).
|
|
* Set the BH_LOCKED flag.
|
|
* Acquire the buffer lock (guaranteed not to block).
|
|
* Release the region lock.
|
|
* Do the I/O and/or initialize the buffer contents.
|
|
* Release the buffer lock.
|
|
* At this point, the buffer lock is available, but the logical
|
|
* operation (flagged by BH_LOCKED) is not yet completed. For
|
|
* this reason, among others, threads checking the BH_LOCKED flag
|
|
* must loop around their test.
|
|
* Acquire the region lock.
|
|
* Clear the BH_LOCKED flag.
|
|
* Release the region lock.
|
|
* Return/discard the buffer.
|
|
*
|
|
* Pointers to DB_MPOOL, MPOOL, DB_MPOOLFILE and MPOOLFILE structures are not
|
|
* reacquired when a region lock is reacquired because they couldn't have been
|
|
* closed/discarded and because they never move in memory.
|
|
*/
|
|
#define LOCKINIT(dbmp, mutexp) \
|
|
if (F_ISSET(dbmp, MP_LOCKHANDLE | MP_LOCKREGION)) \
|
|
(void)__db_mutex_init(mutexp, \
|
|
MUTEX_LOCK_OFFSET((dbmp)->maddr, mutexp))
|
|
|
|
#define LOCKHANDLE(dbmp, mutexp) \
|
|
if (F_ISSET(dbmp, MP_LOCKHANDLE)) \
|
|
(void)__db_mutex_lock(mutexp, (dbmp)->fd)
|
|
#define UNLOCKHANDLE(dbmp, mutexp) \
|
|
if (F_ISSET(dbmp, MP_LOCKHANDLE)) \
|
|
(void)__db_mutex_unlock(mutexp, (dbmp)->fd)
|
|
|
|
#define LOCKREGION(dbmp) \
|
|
if (F_ISSET(dbmp, MP_LOCKREGION)) \
|
|
(void)__db_mutex_lock(&((RLAYOUT *)(dbmp)->mp)->lock, \
|
|
(dbmp)->fd)
|
|
#define UNLOCKREGION(dbmp) \
|
|
if (F_ISSET(dbmp, MP_LOCKREGION)) \
|
|
(void)__db_mutex_unlock(&((RLAYOUT *)(dbmp)->mp)->lock, \
|
|
(dbmp)->fd)
|
|
|
|
#define LOCKBUFFER(dbmp, bhp) \
|
|
if (F_ISSET(dbmp, MP_LOCKREGION)) \
|
|
(void)__db_mutex_lock(&(bhp)->mutex, (dbmp)->fd)
|
|
#define UNLOCKBUFFER(dbmp, bhp) \
|
|
if (F_ISSET(dbmp, MP_LOCKREGION)) \
|
|
(void)__db_mutex_unlock(&(bhp)->mutex, (dbmp)->fd)
|
|
|
|
/*
|
|
* DB_MPOOL --
|
|
* Per-process memory pool structure.
|
|
*/
|
|
struct __db_mpool {
|
|
/* These fields need to be protected for multi-threaded support. */
|
|
db_mutex_t *mutexp; /* Structure lock. */
|
|
|
|
/* List of pgin/pgout routines. */
|
|
LIST_HEAD(__db_mpregh, __db_mpreg) dbregq;
|
|
|
|
/* List of DB_MPOOLFILE's. */
|
|
TAILQ_HEAD(__db_mpoolfileh, __db_mpoolfile) dbmfq;
|
|
|
|
/* These fields are not protected. */
|
|
DB_ENV *dbenv; /* Reference to error information. */
|
|
|
|
MPOOL *mp; /* Address of the shared MPOOL. */
|
|
|
|
void *maddr; /* Address of mmap'd region. */
|
|
void *addr; /* Address of shalloc() region. */
|
|
|
|
DB_HASHTAB *htab; /* Hash table of bucket headers. */
|
|
|
|
int fd; /* Underlying mmap'd fd. */
|
|
|
|
#define MP_ISPRIVATE 0x01 /* Private, so local memory. */
|
|
#define MP_LOCKHANDLE 0x02 /* Threaded, lock handles and region. */
|
|
#define MP_LOCKREGION 0x04 /* Concurrent access, lock region. */
|
|
#define MP_MALLOC 0x08 /* If region in allocated memory. */
|
|
u_int32_t flags;
|
|
};
|
|
|
|
/*
|
|
* DB_MPREG --
|
|
* DB_MPOOL registry of pgin/pgout functions.
|
|
*/
|
|
struct __db_mpreg {
|
|
LIST_ENTRY(__db_mpreg) q; /* Linked list. */
|
|
|
|
int ftype; /* File type. */
|
|
/* Pgin, pgout routines. */
|
|
int (*pgin) __P((db_pgno_t, void *, DBT *));
|
|
int (*pgout) __P((db_pgno_t, void *, DBT *));
|
|
};
|
|
|
|
/*
|
|
* DB_MPOOLFILE --
|
|
* Per-process DB_MPOOLFILE information.
|
|
*/
|
|
struct __db_mpoolfile {
|
|
/* These fields need to be protected for multi-threaded support. */
|
|
db_mutex_t *mutexp; /* Structure lock. */
|
|
|
|
int fd; /* Underlying file descriptor. */
|
|
|
|
u_int32_t pinref; /* Pinned block reference count. */
|
|
|
|
/* These fields are not protected. */
|
|
TAILQ_ENTRY(__db_mpoolfile) q; /* Linked list of DB_MPOOLFILE's. */
|
|
|
|
DB_MPOOL *dbmp; /* Overlying DB_MPOOL. */
|
|
MPOOLFILE *mfp; /* Underlying MPOOLFILE. */
|
|
|
|
void *addr; /* Address of mmap'd region. */
|
|
size_t len; /* Length of mmap'd region. */
|
|
|
|
/* These fields need to be protected for multi-threaded support. */
|
|
#define MP_READONLY 0x01 /* File is readonly. */
|
|
#define MP_UPGRADE 0x02 /* File descriptor is readwrite. */
|
|
#define MP_UPGRADE_FAIL 0x04 /* Upgrade wasn't possible. */
|
|
u_int32_t flags;
|
|
};
|
|
|
|
/*
|
|
* MPOOL --
|
|
* Shared memory pool region. One of these is allocated in shared
|
|
* memory, and describes the pool.
|
|
*/
|
|
struct __mpool {
|
|
RLAYOUT rlayout; /* General region information. */
|
|
|
|
SH_TAILQ_HEAD(__bhq) bhq; /* LRU list of buckets. */
|
|
SH_TAILQ_HEAD(__bhfq) bhfq; /* Free buckets. */
|
|
SH_TAILQ_HEAD(__mpfq) mpfq; /* List of MPOOLFILEs. */
|
|
|
|
/*
|
|
* We make the assumption that the early pages of the file are far
|
|
* more likely to be retrieved than the later pages, which means
|
|
* that the top bits are more interesting for hashing since they're
|
|
* less likely to collide. On the other hand, since 512 4K pages
|
|
* represents a 2MB file, only the bottom 9 bits of the page number
|
|
* are likely to be set. We XOR in the offset in the MPOOL of the
|
|
* MPOOLFILE that backs this particular page, since that should also
|
|
* be unique for the page.
|
|
*/
|
|
#define BUCKET(mp, mf_offset, pgno) \
|
|
(((pgno) ^ ((mf_offset) << 9)) % (mp)->htab_buckets)
|
|
|
|
size_t htab; /* Hash table offset. */
|
|
size_t htab_buckets; /* Number of hash table entries. */
|
|
|
|
DB_LSN lsn; /* Maximum checkpoint LSN. */
|
|
int lsn_cnt; /* Checkpoint buffers left to write. */
|
|
|
|
DB_MPOOL_STAT stat; /* Global mpool statistics. */
|
|
|
|
#define MP_LSN_RETRY 0x01 /* Retry all BH_WRITE buffers. */
|
|
u_int32_t flags;
|
|
};
|
|
|
|
/*
|
|
* MPOOLFILE --
|
|
* Shared DB_MPOOLFILE information.
|
|
*/
|
|
struct __mpoolfile {
|
|
SH_TAILQ_ENTRY q; /* List of MPOOLFILEs */
|
|
|
|
u_int32_t ref; /* Reference count. */
|
|
|
|
int ftype; /* File type. */
|
|
int lsn_off; /* Page's LSN offset. */
|
|
|
|
size_t path_off; /* File name location. */
|
|
size_t fileid_off; /* File identification location. */
|
|
|
|
size_t pgcookie_len; /* Pgin/pgout cookie length. */
|
|
size_t pgcookie_off; /* Pgin/pgout cookie location. */
|
|
|
|
int lsn_cnt; /* Checkpoint buffers left to write. */
|
|
|
|
db_pgno_t last_pgno; /* Last page in the file. */
|
|
|
|
#define MP_CAN_MMAP 0x01 /* If the file can be mmap'd. */
|
|
#define MP_TEMP 0x02 /* Backing file is a temporary. */
|
|
u_int32_t flags;
|
|
|
|
DB_MPOOL_FSTAT stat; /* Per-file mpool statistics. */
|
|
};
|
|
|
|
/*
|
|
* BH --
|
|
* Buffer header.
|
|
*/
|
|
struct __bh {
|
|
db_mutex_t mutex; /* Structure lock. */
|
|
|
|
u_int16_t ref; /* Reference count. */
|
|
|
|
#define BH_CALLPGIN 0x001 /* Page needs to be reworked... */
|
|
#define BH_DIRTY 0x002 /* Page was modified. */
|
|
#define BH_DISCARD 0x004 /* Page is useless. */
|
|
#define BH_LOCKED 0x008 /* Page is locked (I/O in progress). */
|
|
#define BH_TRASH 0x010 /* Page is garbage. */
|
|
#define BH_WRITE 0x020 /* Page scheduled for writing. */
|
|
u_int16_t flags;
|
|
|
|
SH_TAILQ_ENTRY q; /* LRU queue. */
|
|
SH_TAILQ_ENTRY hq; /* MPOOL hash bucket queue. */
|
|
|
|
db_pgno_t pgno; /* Underlying MPOOLFILE page number. */
|
|
size_t mf_offset; /* Associated MPOOLFILE offset. */
|
|
|
|
/*
|
|
* !!!
|
|
* This array must be size_t aligned -- the DB access methods put PAGE
|
|
* and other structures into it, and expect to be able to access them
|
|
* directly. (We guarantee size_t alignment in the db_mpool(3) manual
|
|
* page as well.)
|
|
*/
|
|
u_int8_t buf[1]; /* Variable length data. */
|
|
};
|
|
|
|
#include "mp_ext.h"
|