mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-21 01:12:26 +08: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>.
281 lines
5.7 KiB
C
281 lines
5.7 KiB
C
/*-
|
|
* See the file LICENSE for redistribution information.
|
|
*
|
|
* Copyright (c) 1996, 1997
|
|
* Sleepycat Software. All rights reserved.
|
|
*/
|
|
|
|
#include "config.h"
|
|
|
|
#ifndef lint
|
|
static const char sccsid[] = "@(#)mutex.c 10.25 (Sleepycat) 9/23/97";
|
|
#endif /* not lint */
|
|
|
|
#ifndef NO_SYSTEM_INCLUDES
|
|
#include <sys/types.h>
|
|
|
|
#include <errno.h>
|
|
#include <fcntl.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
#endif
|
|
|
|
#include "db_int.h"
|
|
#include "common_ext.h"
|
|
|
|
#ifdef HAVE_SPINLOCKS
|
|
|
|
#ifdef HAVE_FUNC_AIX
|
|
#define TSL_INIT(x)
|
|
#define TSL_SET(x) (!_check_lock(x, 0, 1))
|
|
#define TSL_UNSET(x) _clear_lock(x, 0)
|
|
#endif
|
|
|
|
#ifdef HAVE_ASSEM_MC68020_GCC
|
|
#include "68020.gcc"
|
|
#endif
|
|
|
|
#if defined(HAVE_FUNC_MSEM)
|
|
/*
|
|
* XXX
|
|
* Should we not use MSEM_IF_NOWAIT and let the system block for us?
|
|
* I've no idea if this will block all threads in the process or not.
|
|
*/
|
|
#define TSL_INIT(x) msem_init(x, MSEM_UNLOCKED)
|
|
#define TSL_SET(x) (!msem_lock(x, MSEM_IF_NOWAIT))
|
|
#define TSL_UNSET(x) msem_unlock(x, 0)
|
|
#endif
|
|
|
|
#ifdef HAVE_FUNC_SGI
|
|
#define TSL_INIT(x) init_lock(x)
|
|
#define TSL_SET(x) (!acquire_lock(x))
|
|
#define TSL_UNSET(x) release_lock(x)
|
|
#endif
|
|
|
|
#ifdef HAVE_FUNC_SOLARIS
|
|
/*
|
|
* Semaphore calls don't work on Solaris 5.5.
|
|
*
|
|
* #define TSL_INIT(x) sema_init(x, 1, USYNC_PROCESS, NULL)
|
|
* #define TSL_SET(x) (sema_wait(x) == 0)
|
|
* #define TSL_UNSET(x) sema_post(x)
|
|
*/
|
|
#define TSL_INIT(x)
|
|
#define TSL_SET(x) (_lock_try(x))
|
|
#define TSL_UNSET(x) _lock_clear(x)
|
|
#endif
|
|
|
|
#ifdef HAVE_ASSEM_SPARC_GCC
|
|
#include "sparc.gcc"
|
|
#endif
|
|
|
|
#ifdef HAVE_ASSEM_UTS4_CC
|
|
#define TSL_INIT(x)
|
|
#define TSL_SET(x) (!uts_lock(x, 1))
|
|
#define TSL_UNSET(x) (*(x) = 0)
|
|
#endif
|
|
|
|
#ifdef HAVE_ASSEM_X86_GCC
|
|
#include "x86.gcc"
|
|
#endif
|
|
|
|
#if defined(_WIN32)
|
|
/* DBDB this needs to be byte-aligned!! */
|
|
#define TSL_INIT(tsl)
|
|
#define TSL_SET(tsl) (!InterlockedExchange((PLONG)tsl, 1))
|
|
#define TSL_UNSET(tsl) (*(tsl) = 0)
|
|
#endif
|
|
|
|
#ifdef macintosh
|
|
/* Mac spinlocks are simple because we cannot possibly be preempted. */
|
|
#define TSL_INIT(tsl)
|
|
#define TSL_SET(tsl) (*(tsl) = 1)
|
|
#define TSL_UNSET(tsl) (*(tsl) = 0)
|
|
#endif
|
|
|
|
#endif /* HAVE_SPINLOCKS */
|
|
|
|
#ifdef MORE_THAN_ONE_PROCESSOR
|
|
#define TSL_DEFAULT_SPINS 5 /* Default spins before block. */
|
|
#else
|
|
#define TSL_DEFAULT_SPINS 1 /* Default spins before block. */
|
|
#endif
|
|
|
|
/*
|
|
* __db_mutex_init --
|
|
* Initialize a DB mutex structure.
|
|
*
|
|
* PUBLIC: void __db_mutex_init __P((db_mutex_t *, off_t));
|
|
*/
|
|
void
|
|
__db_mutex_init(mp, off)
|
|
db_mutex_t *mp;
|
|
off_t off;
|
|
{
|
|
#ifdef DEBUG
|
|
if ((ALIGNTYPE)mp & (MUTEX_ALIGNMENT - 1)) {
|
|
(void)fprintf(stderr,
|
|
"MUTEX ERROR: mutex NOT %d-byte aligned!\n",
|
|
MUTEX_ALIGNMENT);
|
|
abort();
|
|
}
|
|
#endif
|
|
memset(mp, 0, sizeof(db_mutex_t));
|
|
|
|
#ifdef HAVE_SPINLOCKS
|
|
TSL_INIT(&mp->tsl_resource);
|
|
#else
|
|
mp->off = off;
|
|
#endif
|
|
}
|
|
|
|
#define MS(n) ((n) * 1000) /* Milliseconds to micro-seconds. */
|
|
#define SECOND (MS(1000)) /* A second's worth of micro-seconds. */
|
|
|
|
/*
|
|
* __db_mutex_lock
|
|
* Lock on a mutex, logically blocking if necessary.
|
|
*
|
|
* PUBLIC: int __db_mutex_lock __P((db_mutex_t *, int, int (*)(void)));
|
|
*/
|
|
int
|
|
__db_mutex_lock(mp, fd, yield)
|
|
db_mutex_t *mp;
|
|
int fd;
|
|
int (*yield) __P((void));
|
|
{
|
|
u_long usecs;
|
|
|
|
#ifdef HAVE_SPINLOCKS
|
|
int nspins;
|
|
|
|
for (usecs = MS(10);;) {
|
|
/*
|
|
* Try and acquire the uncontested resource lock for
|
|
* TSL_DEFAULT_SPINS.
|
|
*/
|
|
for (nspins = TSL_DEFAULT_SPINS; nspins > 0; --nspins)
|
|
if (TSL_SET(&mp->tsl_resource)) {
|
|
#ifdef DEBUG
|
|
if (mp->pid != 0) {
|
|
(void)fprintf(stderr,
|
|
"MUTEX ERROR: __db_mutex_lock: lock currently locked\n");
|
|
abort();
|
|
}
|
|
mp->pid = getpid();
|
|
#endif
|
|
#ifdef MUTEX_STATISTICS
|
|
if (usecs == MS(10))
|
|
++mp->mutex_set_nowait;
|
|
else
|
|
++mp->mutex_set_wait;
|
|
#endif
|
|
return (0);
|
|
}
|
|
|
|
/* Yield the processor; wait 10ms initially, up to 1 second. */
|
|
if (yield == NULL || yield() != 0) {
|
|
(void)__db_sleep(0, usecs);
|
|
if ((usecs <<= 1) > SECOND)
|
|
usecs = SECOND;
|
|
}
|
|
}
|
|
/* NOTREACHED */
|
|
|
|
#else /* !HAVE_SPINLOCKS */
|
|
struct flock k_lock;
|
|
pid_t mypid;
|
|
int locked;
|
|
|
|
/* Initialize the lock. */
|
|
k_lock.l_whence = SEEK_SET;
|
|
k_lock.l_start = mp->off;
|
|
k_lock.l_len = 1;
|
|
|
|
for (locked = 0, mypid = getpid();;) {
|
|
/*
|
|
* Wait for the lock to become available; wait 10ms initially,
|
|
* up to 1 second.
|
|
*/
|
|
for (usecs = MS(10); mp->pid != 0;)
|
|
if (yield == NULL || yield() != 0) {
|
|
(void)__db_sleep(0, usecs);
|
|
if ((usecs <<= 1) > SECOND)
|
|
usecs = SECOND;
|
|
}
|
|
|
|
/* Acquire an exclusive kernel lock. */
|
|
k_lock.l_type = F_WRLCK;
|
|
if (fcntl(fd, F_SETLKW, &k_lock))
|
|
return (1);
|
|
|
|
/* If the resource tsl is still available, it's ours. */
|
|
if (mp->pid == 0) {
|
|
locked = 1;
|
|
mp->pid = mypid;
|
|
}
|
|
|
|
/* Release the kernel lock. */
|
|
k_lock.l_type = F_UNLCK;
|
|
if (fcntl(fd, F_SETLK, &k_lock))
|
|
return (1);
|
|
|
|
/*
|
|
* If we got the resource tsl we're done.
|
|
*
|
|
* !!!
|
|
* We can't check to see if the lock is ours, because we may
|
|
* be trying to block ourselves in the lock manager, and so
|
|
* the holder of the lock that's preventing us from getting
|
|
* the lock may be us! (Seriously.)
|
|
*/
|
|
if (locked)
|
|
break;
|
|
}
|
|
|
|
#ifdef MUTEX_STATISTICS
|
|
++mp->mutex_set_wait;
|
|
#endif
|
|
return (0);
|
|
#endif /* !HAVE_SPINLOCKS */
|
|
}
|
|
|
|
/*
|
|
* __db_mutex_unlock --
|
|
* Release a lock.
|
|
*
|
|
* PUBLIC: int __db_mutex_unlock __P((db_mutex_t *, int));
|
|
*/
|
|
int
|
|
__db_mutex_unlock(mp, fd)
|
|
db_mutex_t *mp;
|
|
int fd;
|
|
{
|
|
#ifdef DEBUG
|
|
if (mp->pid == 0) {
|
|
(void)fprintf(stderr,
|
|
"MUTEX ERROR: __db_mutex_unlock: lock already unlocked\n");
|
|
abort();
|
|
}
|
|
#endif
|
|
|
|
#ifdef HAVE_SPINLOCKS
|
|
#ifdef DEBUG
|
|
mp->pid = 0;
|
|
#endif
|
|
|
|
/* Release the resource tsl. */
|
|
TSL_UNSET(&mp->tsl_resource);
|
|
#else
|
|
/*
|
|
* Release the resource tsl. We don't have to acquire any locks
|
|
* because processes trying to acquire the lock are checking for
|
|
* a pid of 0, not a specific value.
|
|
*/
|
|
mp->pid = 0;
|
|
#endif
|
|
return (0);
|
|
}
|