mirror of
https://sourceware.org/git/glibc.git
synced 2024-10-03 20:47:42 +00:00
a5a0310d8e
1997-09-30 18:03 Ulrich Drepper <drepper@cygnus.com> * Makerules: Undo last change. * csu/Makefile: Define before-compile at the right place. * aclocal.m4: Remove a.out file created by assembler test. * set-init.c: Find set-hooks.h using <...>. Update to db 2.3.10. * db2/Makefile: Update. * db2/db.h: Likewise. * db2/db_185.h: Likewise. * db2/db_int.h: Likewise. * db2/btree/bt_close.c: Likewise. * db2/btree/bt_conv.c: Likewise. * db2/btree/bt_cursor.c: Likewise. * db2/btree/bt_put.c: Likewise. * db2/btree/bt_rec.c: Likewise. * db2/btree/bt_recno.c: Likewise. * db2/btree/btree.src: Likewise. * db2/btree/btree_auto.c: Likewise. * db2/clib/getlong.c: Likewise. * db2/db/db.c: Likewise. * db2/db/db_auto.c: Likewise. * db2/db/db_conv.c: Likewise. * db2/db/db_pr.c: Likewise. * db2/db/db_ret.c: Likewise. * db2/db/db_thread.c: Likewise. * db2/hash/hash.c: Likewise. * db2/hash/hash_auto.c: Likewise. * db2/hash/hash_conv.c: Likewise. * db2/hash/hash_dup.c: Likewise. * db2/hash/hash_func.c: Likewise. * db2/hash/hash_page.c: Likewise. * db2/hash/hash_rec.c: Likewise. * db2/include/btree.h: Likewise. * db2/include/btree_ext.h: Likewise. * db2/include/db.h.src: Likewise. * db2/include/db_185.h.src: Likewise. * db2/include/db_cxx.h: Likewise. * db2/include/db_ext.h: Likewise. * db2/include/db_int.h.src: Likewise. * db2/include/db_page.h: Likewise. * db2/include/db_shash.h: Likewise. * db2/include/lock.h: Likewise. * db2/include/log.h: Likewise. * db2/include/log_ext.h: Likewise. * db2/include/mp.h: Likewise. * db2/include/shqueue.h: Likewise. * db2/include/txn.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/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_fset.c: Likewise. * db2/mp/mp_open.c: Likewise. * db2/mutex/mutex.c: Likewise. * db2/os/db_os_dir.c: Likewise. * db2/progs/db_checkpoint/db_checkpoint.c: Likewise. * db2/progs/db_deadlock/db_deadlock.c: Likewise. * db2/progs/db_dump185/db_dump185.c: Likewise. * db2/progs/db_load/db_load.c: Likewise. * db2/progs/db_recover/db_recover.c: Likewise. * db2/txn/txn.c: Likewise. * db2/txn/txn_auto.c: Likewise. * elf/link.h: Define struct libname_list outside struct link_map to not confuse C++ compilers. * include/features.h: Recognize _XOPEN_SOURCE == 500 and set __USE_UNIX98. * manual/creature.texi: Explain this. * libc.map: Add new functions. * libio/Makefile (routines): Add fseeko and ftello. * libio/ftello.c: New file. * libio/fseeko.c: New file. * libio/stdio.h: Add prototypes for new functions. * manual/stdio.texi: Document fseeko and ftello. * posix/Makefile (routines): Add pread and pwrite. * sysdeps/posix/pread.c: New file. * sysdeps/posix/pwrite.c: New file. * sysdeps/stub/pread.c: New file. * sysdeps/stub/pwrite.c: New file. * posix/unistd.h: Add prototypes for pread and pwrite. Pretty print header. Define gid_t, uid_t, off_t, pid_t if __USE_UNIX98. Declare ctermid and cuserid if __USE_UNIX98. (swab): Change to take void * arguments. * string/swab.c: Change parameter to void *. * posix/sys/types: Define gid_t, uid_t, off_t, pid_t only if not already happened. * manual/llio.texi: Document pread and pwrite. * string/strings.h: Don't simply include string.h. Define BSD functions according to Unix98. * stdlib/tst-strtol.c: Include <string.h> not <strings.h>. * sunrpc/clnt_simp.c: Likewise. * malloc/Makefile (aux): Add set-freeres. * malloc/mtrace.c: Define function release_libc_mem which calls the __libc_subfreeres handler. (mtrace): Register release_libc_mem. * malloc/set-freeres.c: New file. * intl/dcgettext.c: Define free_mem function and add to __libc_subfreeres list. * intl/finddomain.c: Likewise. * intl/gettextP.h (struct loaded_domain): Add new fields use_mmap and mmap_size. Add prototype for _nl_unloaded_domain. * intl/loadmsgcat.c: Define new function _nl_unload_domain. (_nl_load_domain): Store informaiton about mmap use and file size. * intl/localealias.c (read_alias_file): Optimize locale alias file reading by avoid frequen mallocs. Define free_mem function and add to __libc_subfreeres list. * locale/localeinfo.h: Make a difference between MAX_USAGE_COUNT and undeletable. Add prototype for _nl_unload_locale. * locale/C-collate: Mark data as undeletable by using UNDELETABLE. * locale/C-ctype: Likewise. * locale/C-messages: Likewise. * locale/C-monetary: Likewise. * locale/C-numeric: Likewise. * locale/C-time: Likewise. * locale/findlocale.c (_nl_find_locale, _nl_remove_locale): Handle MAX_USAGE_COUNT and UNDELETABLE. (free_mem): New function. Add it to __libc_subfreeres list. * locale/loadlocale.c: Define _nl_unload_locale function. * misc/hsearch.c: Register hdestroy in __libc_subfreeres list. * stdlib/fmtmsg.c (addseverity): Handle illegal severity arguments correctly Define free_mem function and add to __libc_subfreeres list. * locale/programs/localedef.c (options): short form os verbose is v. Reported by Andreas Jaeger. * misc/sys/select.h: Define pselect only is __USE_POSIX since this header is used in some others as well for historical reasons. * resolv/resolv.h: Include <netinet/in.h> to make self-contained. * string/bits/string2.h: Add missing braces and optimize strcmp a bit more. * sysdeps/i386/i486/bits/string.h: Likewise. * sunrpc/rpc/auth_des.h: Include rpc/auth.h to be self-contained. Pretty print. * sysdeps/mach/hurd/cthreads.c: Add copyright text. * sysdeps/unix/sysv/linux/syscalls.list: Correct prctl entry. * sysdeps/unix/sysv/linux/sys/mman.h: Get definition of size_t. * time/time.h: Pretty print. 1997-09-29 Paul Eggert <eggert@twinsun.com> * time/strftime.c: Synchronize with GNU Emacs strftime.c. (HAVE_MEMCPY): Define if emacs is defined and HAVE_BCOPY isn't. (gmtime_r, localtime_r): Undef before defining. (iso_week_days): Use __inline__, not inline. 1997-09-27 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/m68k/fpu/bits/mathinline.h: Rename exp2{,l,f} to __ieee754_exp2{,l,f}. * sysdeps/m68k/fpu/s_exp2.c: Likewise. * sysdeps/m68k/fpu/s_exp2l.c: Likewise. * sysdeps/m68k/fpu/s_exp2f.c: Likewise. 1997-09-27 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * elf/soinit.c (__EH_FRAME_BEGIN__): Don't make the .eh_frame section read-only, it contains relocations. * elf/sofini.c (__FRAME_END__): Likewise. 1997-09-29 03:08 Ulrich Drepper <drepper@cygnus.com> * sysdeps/i386/i486/bits/string.h [__PIC__] (__strspn_cg, __strcspn_cg, __strpbrk_cg, __strstr_cg): Optimize even more. No spill register needed. Patch by NIIBE Yutaka <gniibe@mri.co.jp>. 1997-09-28 08:27 Thorsten Kukuk <kukuk@vt.uni-paderborn.de> * nis/nis_call.c (__do_niscall2): Fix return code, add missing break in switch case. * nis/nis_mkdir.c: Fix return codes to match Solaris version. * nis/nis_rmdir.c: Likewise. * nis/rpcsvc/yp_prot.h: Rename struct keydat to struct keydat_t for C++. 1997-09-28 04:32 Ulrich Drepper <drepper@cygnus.com> * configure.in: Fix typo. Patch by Zack Weinberg <zack@rabi.phys.columbia.edu>. 1997-09-25 20:14 Philip Blundell <Philip.Blundell@pobox.com> * sysdeps/unix/sysv/linux/scsi/sg.h: New file. * sysdeps/unix/sysv/linux/Makefile: Install <scsi/sg.h>.
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.16 (Sleepycat) 9/23/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 *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. */
|
|
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. */
|
|
|
|
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"
|