mirror of
https://sourceware.org/git/glibc.git
synced 2024-10-03 20:47:42 +00:00
26b4d76671
1997-09-05 03:15 Ulrich Drepper <drepper@cygnus.com> * Makefile (subdirs): Reorganize order so that nss follows add-ons. * config.make.in (LDAP): Add. * configure.in: Prepare for ldap add-on. * shlib-versions: Add version numbers for ldap NSS module. * nss/Makefile: Add rules to build ldap NSS module. * db/btree/bt_page.c (__bt_free): Update meta data information. Update db from db-2.3.6. * db2/db.h: Updated. * db2/btree/bt_close.c: Updated. * db2/btree/bt_compare.c: Updated. * db2/btree/bt_conv.c: Updated. * db2/btree/bt_cursor.c: Updated. * db2/btree/bt_delete.c: Updated. * db2/btree/bt_put.c: Updated. * db2/btree/bt_rec.c: Updated. * db2/btree/bt_recno.c: Updated. * db2/btree/bt_search.c: Updated. * db2/btree/bt_split.c: Updated. * db2/btree/bt_stat.c: Updated. * db2/common/db_appinit.c: Updated. * db2/common/db_apprec.c: Updated. * db2/common/db_byteorder.c: Updated. * db2/common/db_err.c: Updated. * db2/common/db_region.c: Updated. * db2/db/db.c: Updated. * db2/db/db_conv.c: Updated. * db2/db/db_dup.c: Updated. * db2/db/db_pr.c: Updated. * db2/db/db_ret.c: Updated. * db2/db185/db185.c: Updated. * db2/dbm/dbm.c: Updated. * db2/hash/hash_dup.c: Updated. * db2/include/db_am.h: Updated. * db2/include/db_page.h: Updated. * db2/include/mp.h: Updated. * db2/include/queue.h: Updated. * db2/log/log.c: Updated. * db2/log/log_findckp.c: Updated. * db2/log/log_get.c: Updated. * db2/log/log_rec.c: Updated. * db2/mp/mp_bh.c: Updated. * db2/mp/mp_fopen.c: Updated. * db2/mp/mp_pr.c: Updated. * db2/mp/mp_sync.c: Updated. * db2/mutex/x86.gcc: Updated. * db2/os/db_os_dir.c: Updated. * db2/os/db_os_fid.c: Updated. * db2/progs/db_archive/db_archive.c: Updated. * db2/progs/db_checkpoint/db_checkpoint.c: Updated. * db2/progs/db_deadlock/db_deadlock.c: Updated. * db2/progs/db_dump/db_dump.c: Updated. * db2/progs/db_dump185/db_dump185.c: Updated. * db2/progs/db_load/db_load.c: Updated. * db2/progs/db_printlog/db_printlog.c: Updated. * db2/progs/db_recover/db_recover.c: Updated. * db2/progs/db_stat/db_stat.c: Updated. * db2/txn/txn.c: Updated. * db2/txn/txn_rec.c: Updated. * db2/Makefile: Add rule to build db_printlog. * db2/config.h: Don't include endian.h and don't define WORDS_BIGENDIAN. Only define HAVE_ENDIAN_H. * elf/dl-open.c (_dl_open): Make thread-safe. * elf/dl-close.c (_dl_close): Likewise. * elf/dlclose.c: Pretty print. * elf/dl-version.c (make_string): Use __strdup not strdup. (find_needed): Don't use l_searchlist of _dl_loaded, use the l_next list. * elf/dl-deps.c (_dl_map_object_deps): Remove variable head. * manual/math.texi: Add note about == and != for FP values. * manual/message.texi: Mention problems with relative paths and binstextdomain. * manual/string.texi: Mark strdupa and strndupa correctly as macros. * sunrpc/Makefile (CFLAGS-xkey_prot.c): Define to prevent warnings. * sunrpc/rpc_cout.c: Avoid needless races around return value. * sysdeps/generic/stpcpy.c: Include <config.h> if wanted. Update from tzdata-1997h. * time/africa: Updated. * time/europe: Updated. * time/iso3166.tab: Updated. * time/northamerica: Updated. * time/southamerica: Updated. * time/zone.tab: Updated. 1997-09-04 13:19 Richard Henderson <rth@cygnus.com> * sysdeps/alpha/w_sqrt.S: Removed. * sysdeps/alpha/fpu/e_sqrt.c: New. Obey -mieee and -mieee-with-inexact and build a version that is as fast as possible given the constraint. 1997-08-30 Andreas Jaeger <aj@arthur.rhein-neckar.de> * manual/maint.texi: Document some defaults for configuration parameters. 1997-09-04 15:57 Ulrich Drepper <drepper@cygnus.com> * termios/cfsetspeed.c (cfsetspeed): Change return value to int. * termios/termios.h: Change prototype accordingly. Reported by Andreas Jaeger <aj@arthur.rhein-neckar.de>. 1997-07-26 14:42 H.J. Lu <hjl@gnu.ai.mit.edu> * libio/stdfiles.c (_libio_using_thunks): Define if _G_USING_THUNKS is defined. * libio/_G_config.h: Moved to ... * sysdeps/generic/_G_config.h: ...here. * sysdeps/unix/sysv/linux/_G_config.h: New, Add vtable thunks support. 1997-09-02 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/m68k/Makefile (pic-ccflag): Override it for more efficient code (together with a change in gcc). * Makeconfig (pic-ccflag): New variable. (CFLAGS-.os): Use it instead of hardcoding -fPIC. 1997-09-02 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/m68k/dl-machine.h (elf_machine_load_address): Use _dl_start instead of a local label, to avoid getting an unreadable label name. 1997-09-02 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * nss/Makefile ($(objpfx)libnss_db.so): Use $(dbobjdir) to find libdb.so. * Makeconfig (dbobjdir): Use db2. 1997-08-31 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * manual/maint.texi (Porting to Unix): Update description of the implementation of Unix system calls. (Contributors): Use real umlaut in tege's name. 1997-08-30 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/libm-ieee754/w_gamma.c: Make compilable with _IEEE_LIBM. * sysdeps/libm-ieee754/w_gammaf.c: Likewise. * sysdeps/libm-ieee754/w_gammal.c: Likewise.
270 lines
8.4 KiB
C
270 lines
8.4 KiB
C
/*-
|
|
* See the file LICENSE for redistribution information.
|
|
*
|
|
* Copyright (c) 1996, 1997
|
|
* Sleepycat Software. All rights reserved.
|
|
*
|
|
* @(#)mp.h 10.15 (Sleepycat) 8/29/97
|
|
*/
|
|
|
|
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)
|
|
|
|
/* Macro to return per-process address, offsets. */
|
|
#define ADDR(base, offset) ((void *)((u_int8_t *)((base)->addr) + offset))
|
|
#define OFFSET(base, p) ((u_int8_t *)(p) - (u_int8_t *)(base)->addr)
|
|
|
|
#define INVALID 0 /* Invalid shared memory offset. */
|
|
#define TEMPORARY "<tmp>" /* Temporary file name. */
|
|
|
|
/*
|
|
* There are two kinds of locks in the mpool code. The first is the region
|
|
* lock, used to serialize modifications to all data structures. The second
|
|
* is a per-buffer header lock. The locking order is as follows:
|
|
*
|
|
* Process searching for a buffer:
|
|
* Acquire the region lock.
|
|
* Find the buffer header.
|
|
* Increment the reference count (guarantee the buffer stays).
|
|
* If the BH_LOCKED flag is set:
|
|
* Release the region lock.
|
|
* Acquire the buffer lock.
|
|
* Release the buffer lock.
|
|
* Acquire the region lock.
|
|
* Return the buffer.
|
|
*
|
|
* Process 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 buffer contents.
|
|
* Acquire the region lock.
|
|
* Clear the BH_LOCKED flag.
|
|
* Release the region lock.
|
|
* Release the buffer lock.
|
|
* If reading, return 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, (dbmp)->fd)
|
|
|
|
#define LOCKHANDLE(dbmp, mutexp) \
|
|
if (F_ISSET(dbmp, MP_LOCKHANDLE)) \
|
|
(void)__db_mutex_lock(mutexp, (dbmp)->fd, \
|
|
(dbmp)->dbenv == NULL ? NULL : (dbmp)->dbenv->db_yield)
|
|
#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, \
|
|
(dbmp)->dbenv == NULL ? NULL : (dbmp)->dbenv->db_yield)
|
|
#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, \
|
|
(dbmp)->dbenv == NULL ? NULL : (dbmp)->dbenv->db_yield)
|
|
#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 mutex; /* 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. */
|
|
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 mutex; /* 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. */
|
|
|
|
char *path; /* Initial file path. */
|
|
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_PATH_ALLOC 0x001 /* Path is allocated memory. */
|
|
#define MP_PATH_TEMP 0x002 /* Backing file is a temporary. */
|
|
#define MP_READONLY 0x004 /* File is readonly. */
|
|
#define MP_UPGRADE 0x008 /* File descriptor is readwrite. */
|
|
#define MP_UPGRADE_FAIL 0x010 /* 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 can_mmap; /* If the file can be mmap'd. */
|
|
|
|
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_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 list of bucket headers. */
|
|
SH_TAILQ_ENTRY mq; /* MPOOLFILE list of bucket headers. */
|
|
|
|
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"
|