mirror of
https://sourceware.org/git/glibc.git
synced 2025-07-29 11:41:21 +03:00
Update.
1998-06-09 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/netinet/ip.h (struct ip_options): Define __data member only for gcc. Reported by ak@muc.de. * misc/mntent.h: Undo last patch. * sysdeps/unix/sysv/linux/fstatvfs.c (fstatvfs): Undo last patch. * misc/tst/mntent.c: Adjust code for this change. * io/fts.c: Updated from a slightly more recent BSD version. * io/fts.h: Likewise. * libc.map: Add __libc_stack_end. * db2/Makefile (routines): Add lock_region. * db2/config.h: Update from db-2.4.14. * db2/db.h: Likewise. * db2/db_185.h: Likewise. * db2/db_int.h: Likewise. * db2/bt_close.c: Likewise. * db2/bt_compare.c: Likewise. * db2/bt_conv.c: Likewise. * db2/bt_cursor.c: Likewise. * db2/bt_delete.c: Likewise. * db2/bt_open.c: Likewise. * db2/bt_page.c: Likewise. * db2/bt_put.c: Likewise. * db2/bt_rec.c: Likewise. * db2/bt_recno.c: Likewise. * db2/bt_rsearch.c: Likewise. * db2/bt_search.c: Likewise. * db2/bt_split.c: Likewise. * db2/bt_stat.c: Likewise. * db2/btree.src: Likewise. * db2/btree_auto.c: Likewise. * db2/getlong.c: Likewise. * db2/db_appinit.c: Likewise. * db2/db_apprec.c: Likewise. * db2/db_byteorder.c: Likewise. * db2/db_err.c: Likewise. * db2/db_log2.c: Likewise. * db2/db_region.c: Likewise. * db2/db_salloc.c: Likewise. * db2/db_shash.c: Likewise. * db2/db.c: Likewise. * db2/db.src: Likewise. * db2/db_auto.c: Likewise. * db2/db_conv.c: Likewise. * db2/db_dispatch.c: Likewise. * db2/db_dup.c: Likewise. * db2/db_overflow.c: Likewise. * db2/db_pr.c: Likewise. * db2/db_rec.c: Likewise. * db2/db_ret.c: Likewise. * db2/db_thread.c: Likewise. * db2/db185.c: Likewise. * db2/db185_int.h: Likewise. * db2/dbm.c: Likewise. * db2/hash.c: Likewise. * db2/hash.src: Likewise. * db2/hash_auto.c: Likewise. * db2/hash_conv.c: Likewise. * db2/hash_debug.c: Likewise. * db2/hash_dup.c: Likewise. * db2/hash_func.c: Likewise. * db2/hash_page.c: Likewise. * db2/hash_rec.c: Likewise. * db2/hash_stat.c: Likewise. * db2/btree.h: Likewise. * db2/btree_ext.h: Likewise. * db2/clib_ext.h: Likewise. * db2/common_ext.h: Likewise. * db2/cxx_int.h: Likewise. * db2/db.h.src: Likewise. * db2/db_185.h.src: Likewise. * db2/db_am.h: Likewise. * db2/db_auto.h: Likewise. * db2/db_cxx.h: Likewise. * db2/db_dispatch.h: Likewise. * db2/db_ext.h: Likewise. * db2/db_int.h.src: Likewise. * db2/db_page.h: Likewise. * db2/db_shash.h: Likewise. * db2/db_swap.h: Likewise. * db2/hash.h: Likewise. * db2/hash_ext.h: Likewise. * db2/lock.h: Likewise. * db2/lock_ext.h: Likewise. * db2/log.h: Likewise. * db2/log_ext.h: Likewise. * db2/mp.h: Likewise. * db2/mp_ext.h: Likewise. * db2/mutex_ext.h: Likewise. * db2/os_ext.h: Likewise. * db2/os_func.h: Likewise. * db2/queue.h: Likewise. * db2/shqueue.h: Likewise. * db2/txn.h: Likewise. * db2/lock.c: Likewise. * db2/lock_conflict.c: Likewise. * db2/lock_deadlock.c: Likewise. * db2/lock_region.c: Likewise. * db2/lock_util.c: Likewise. * db2/log.c: Likewise. * db2/log.src: Likewise. * db2/log_archive.c: Likewise. * db2/log_auto.c: Likewise. * db2/log_compare.c: Likewise. * db2/log_findckp.c: Likewise. * db2/log_get.c: Likewise. * db2/log_put.c: Likewise. * db2/log_rec.c: Likewise. * db2/log_register.c: Likewise. * db2/mp_bh.c: Likewise. * db2/mp_fget.c: Likewise. * db2/mp_fopen.c: Likewise. * db2/mp_fput.c: Likewise. * db2/mp_fset.c: Likewise. * db2/mp_open.c: Likewise. * db2/mp_pr.c: Likewise. * db2/mp_region.c: Likewise. * db2/mp_sync.c: Likewise. * db2/68020.gcc: Likewise. * db2/mutex.c: Likewise. * db2/parisc.gcc: Likewise. * db2/parisc.hp: Likewise. * db2/sco.cc: Likewise. * db2/os_abs.c: Likewise. * db2/os_alloc.c: Likewise. * db2/os_config.c: Likewise. * db2/os_dir.c: Likewise. * db2/os_fid.c: Likewise. * db2/os_fsync.c: Likewise. * db2/os_map.c: Likewise. * db2/os_oflags.c: Likewise. * db2/os_open.c: Likewise. * db2/os_rpath.c: Likewise. * db2/os_rw.c: Likewise. * db2/os_seek.c: Likewise. * db2/os_sleep.c: Likewise. * db2/os_spin.c: Likewise. * db2/os_stat.c: Likewise. * db2/os_unlink.c: Likewise. * db2/db_archive.c: Likewise. * db2/db_checkpoint.c: Likewise. * db2/db_deadlock.c: Likewise. * db2/db_dump.c: Likewise. * db2/db_dump185.c: Likewise. * db2/db_load.c: Likewise. * db2/db_printlog.c: Likewise. * db2/db_recover.c: Likewise. * db2/db_stat.c: Likewise. * db2/txn.c: Likewise. * db2/txn.src: Likewise. * db2/txn_auto.c: Likewise. * db2/txn_rec.c: Likewise. * elf/rtld.c: Move definition of __libc_stack_end to ... * sysdeps/generic/dl-sysdep.h: ...here. * sysdeps/unix/sysv/linux/fstatvfs.c: Handle nodiratime option. * sysdeps/unix/sysv/linux/bits/statvfs.h: Define ST_NODIRATIME. * sysdeps/unix/sysv/linux/sys/mount.h: Define MS_NODIRATIME. 1998-06-08 21:44 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/fstatvfs.c: Handle constant option string from mntent correctly. 1998-06-06 Andreas Jaeger <aj@arthur.rhein-neckar.de> * sunrpc/Makefile (generated): Correct typo. 1998-06-04 Philip Blundell <philb@gnu.org> * elf/elf.h (EM_ARM, et al.): New definitions. * sysdeps/arm/dl-machine.h: Update for new draft ARM ELF ABI.
This commit is contained in:
Ulrich Drepper
@ -1,14 +1,14 @@
|
||||
/*-
|
||||
* See the file LICENSE for redistribution information.
|
||||
*
|
||||
* Copyright (c) 1996, 1997
|
||||
* Copyright (c) 1996, 1997, 1998
|
||||
* Sleepycat Software. All rights reserved.
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
|
||||
#ifndef lint
|
||||
static const char sccsid[] = "@(#)mutex.c 10.32 (Sleepycat) 1/16/98";
|
||||
static const char sccsid[] = "@(#)mutex.c 10.48 (Sleepycat) 5/23/98";
|
||||
#endif /* not lint */
|
||||
|
||||
#ifndef NO_SYSTEM_INCLUDES
|
||||
@ -16,14 +16,12 @@ static const char sccsid[] = "@(#)mutex.c 10.32 (Sleepycat) 1/16/98";
|
||||
|
||||
#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
|
||||
|
||||
@ -43,13 +41,21 @@ static const char sccsid[] = "@(#)mutex.c 10.32 (Sleepycat) 1/16/98";
|
||||
* 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_INIT(x) (msem_init(x, MSEM_UNLOCKED) == NULL)
|
||||
#define TSL_INIT_ERROR 1
|
||||
#define TSL_SET(x) (!msem_lock(x, MSEM_IF_NOWAIT))
|
||||
#define TSL_UNSET(x) msem_unlock(x, 0)
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_FUNC_RELIANT
|
||||
#define TSL_INIT(x) initspin(x, 1)
|
||||
#define TSL_SET(x) (cspinlock(x) == 0)
|
||||
#define TSL_UNSET(x) spinunlock(x)
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_FUNC_SGI
|
||||
#define TSL_INIT(x) init_lock(x)
|
||||
#define TSL_INIT(x) (init_lock(x) != 0)
|
||||
#define TSL_INIT_ERROR 1
|
||||
#define TSL_SET(x) (!acquire_lock(x))
|
||||
#define TSL_UNSET(x) release_lock(x)
|
||||
#endif
|
||||
@ -58,7 +64,8 @@ static const char sccsid[] = "@(#)mutex.c 10.32 (Sleepycat) 1/16/98";
|
||||
/*
|
||||
* Semaphore calls don't work on Solaris 5.5.
|
||||
*
|
||||
* #define TSL_INIT(x) sema_init(x, 1, USYNC_PROCESS, NULL)
|
||||
* #define TSL_INIT(x) (sema_init(x, 1, USYNC_PROCESS, NULL) != 0)
|
||||
* #define TSL_INIT_ERROR 1
|
||||
* #define TSL_SET(x) (sema_wait(x) == 0)
|
||||
* #define TSL_UNSET(x) sema_post(x)
|
||||
*/
|
||||
@ -67,6 +74,10 @@ static const char sccsid[] = "@(#)mutex.c 10.32 (Sleepycat) 1/16/98";
|
||||
#define TSL_UNSET(x) _lock_clear(x)
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_ASSEM_PARISC_GCC
|
||||
#include "parisc.gcc"
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_ASSEM_SCO_CC
|
||||
#include "sco.cc"
|
||||
#endif
|
||||
@ -85,17 +96,20 @@ static const char sccsid[] = "@(#)mutex.c 10.32 (Sleepycat) 1/16/98";
|
||||
#include "x86.gcc"
|
||||
#endif
|
||||
|
||||
#if defined(_WIN32)
|
||||
/* DBDB this needs to be byte-aligned!! */
|
||||
#ifdef WIN16
|
||||
/* Win16 spinlocks are simple because we cannot possibly be preempted. */
|
||||
#define TSL_INIT(tsl)
|
||||
#define TSL_SET(tsl) (!InterlockedExchange((PLONG)tsl, 1))
|
||||
#define TSL_SET(tsl) (*(tsl) = 1)
|
||||
#define TSL_UNSET(tsl) (*(tsl) = 0)
|
||||
#endif
|
||||
|
||||
#ifdef macintosh
|
||||
/* Mac spinlocks are simple because we cannot possibly be preempted. */
|
||||
#if defined(_WIN32)
|
||||
/*
|
||||
* XXX
|
||||
* DBDB this needs to be byte-aligned!!
|
||||
*/
|
||||
#define TSL_INIT(tsl)
|
||||
#define TSL_SET(tsl) (*(tsl) = 1)
|
||||
#define TSL_SET(tsl) (!InterlockedExchange((PLONG)tsl, 1))
|
||||
#define TSL_UNSET(tsl) (*(tsl) = 0)
|
||||
#endif
|
||||
|
||||
@ -105,14 +119,14 @@ static const char sccsid[] = "@(#)mutex.c 10.32 (Sleepycat) 1/16/98";
|
||||
* __db_mutex_init --
|
||||
* Initialize a DB mutex structure.
|
||||
*
|
||||
* PUBLIC: void __db_mutex_init __P((db_mutex_t *, u_int32_t));
|
||||
* PUBLIC: int __db_mutex_init __P((db_mutex_t *, u_int32_t));
|
||||
*/
|
||||
void
|
||||
int
|
||||
__db_mutex_init(mp, off)
|
||||
db_mutex_t *mp;
|
||||
u_int32_t off;
|
||||
{
|
||||
#ifdef DEBUG
|
||||
#ifdef DIAGNOSTIC
|
||||
if ((ALIGNTYPE)mp & (MUTEX_ALIGNMENT - 1)) {
|
||||
(void)fprintf(stderr,
|
||||
"MUTEX ERROR: mutex NOT %d-byte aligned!\n",
|
||||
@ -125,11 +139,17 @@ __db_mutex_init(mp, off)
|
||||
#ifdef HAVE_SPINLOCKS
|
||||
COMPQUIET(off, 0);
|
||||
|
||||
#ifdef TSL_INIT_ERROR
|
||||
if (TSL_INIT(&mp->tsl_resource))
|
||||
return (errno);
|
||||
#else
|
||||
TSL_INIT(&mp->tsl_resource);
|
||||
#endif
|
||||
mp->spins = __os_spin();
|
||||
#else
|
||||
mp->off = off;
|
||||
#endif
|
||||
return (0);
|
||||
}
|
||||
|
||||
#define MS(n) ((n) * 1000) /* Milliseconds to micro-seconds. */
|
||||
@ -147,17 +167,25 @@ __db_mutex_lock(mp, fd)
|
||||
int fd;
|
||||
{
|
||||
u_long usecs;
|
||||
|
||||
#ifdef HAVE_SPINLOCKS
|
||||
int nspins;
|
||||
#else
|
||||
struct flock k_lock;
|
||||
pid_t mypid;
|
||||
int locked;
|
||||
#endif
|
||||
|
||||
if (!DB_GLOBAL(db_mutexlocks))
|
||||
return (0);
|
||||
|
||||
#ifdef HAVE_SPINLOCKS
|
||||
COMPQUIET(fd, 0);
|
||||
|
||||
for (usecs = MS(10);;) {
|
||||
/* Try and acquire the uncontested resource lock for N spins. */
|
||||
for (nspins = mp->spins; nspins > 0; --nspins)
|
||||
if (TSL_SET(&mp->tsl_resource)) {
|
||||
#ifdef DEBUG
|
||||
#ifdef DIAGNOSTIC
|
||||
if (mp->pid != 0) {
|
||||
(void)fprintf(stderr,
|
||||
"MUTEX ERROR: __db_mutex_lock: lock currently locked\n");
|
||||
@ -182,9 +210,6 @@ __db_mutex_lock(mp, fd)
|
||||
/* NOTREACHED */
|
||||
|
||||
#else /* !HAVE_SPINLOCKS */
|
||||
struct flock k_lock;
|
||||
pid_t mypid;
|
||||
int locked;
|
||||
|
||||
/* Initialize the lock. */
|
||||
k_lock.l_whence = SEEK_SET;
|
||||
@ -246,7 +271,10 @@ __db_mutex_unlock(mp, fd)
|
||||
db_mutex_t *mp;
|
||||
int fd;
|
||||
{
|
||||
#ifdef DEBUG
|
||||
if (!DB_GLOBAL(db_mutexlocks))
|
||||
return (0);
|
||||
|
||||
#ifdef DIAGNOSTIC
|
||||
if (mp->pid == 0) {
|
||||
(void)fprintf(stderr,
|
||||
"MUTEX ERROR: __db_mutex_unlock: lock already unlocked\n");
|
||||
@ -257,7 +285,7 @@ __db_mutex_unlock(mp, fd)
|
||||
#ifdef HAVE_SPINLOCKS
|
||||
COMPQUIET(fd, 0);
|
||||
|
||||
#ifdef DEBUG
|
||||
#ifdef DIAGNOSTIC
|
||||
mp->pid = 0;
|
||||
#endif
|
||||
|
||||
|
||||
Reference in New Issue
Block a user