mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-10 15:20:10 +00:00
bf7997b65c
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.
242 lines
4.1 KiB
C
242 lines
4.1 KiB
C
/*-
|
|
* See the file LICENSE for redistribution information.
|
|
*
|
|
* Copyright (c) 1996, 1997, 1998
|
|
* Sleepycat Software. All rights reserved.
|
|
*/
|
|
|
|
#include "config.h"
|
|
|
|
#ifndef lint
|
|
static const char copyright[] =
|
|
"@(#) Copyright (c) 1996, 1997, 1998\n\
|
|
Sleepycat Software Inc. All rights reserved.\n";
|
|
static const char sccsid[] = "@(#)db_deadlock.c 10.19 (Sleepycat) 4/10/98";
|
|
#endif
|
|
|
|
#ifndef NO_SYSTEM_INCLUDES
|
|
#include <sys/types.h>
|
|
|
|
#include <errno.h>
|
|
#include <limits.h>
|
|
#include <signal.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <time.h>
|
|
#include <unistd.h>
|
|
#endif
|
|
|
|
#include "db_int.h"
|
|
#include "clib_ext.h"
|
|
#include "common_ext.h"
|
|
|
|
#define BAD_KILLID 0xffffffff
|
|
|
|
DB_ENV *db_init __P((char *, int));
|
|
int logpid __P((char *, int));
|
|
int main __P((int, char *[]));
|
|
void onint __P((int));
|
|
void siginit __P((void));
|
|
void usage __P((void));
|
|
|
|
int interrupted;
|
|
const char
|
|
*progname = "db_deadlock"; /* Program name. */
|
|
|
|
int
|
|
main(argc, argv)
|
|
int argc;
|
|
char *argv[];
|
|
{
|
|
extern char *optarg;
|
|
extern int optind;
|
|
DB_ENV *dbenv;
|
|
u_int32_t atype;
|
|
time_t now;
|
|
long usecs;
|
|
u_int32_t flags;
|
|
int ch, verbose;
|
|
char *home, *logfile;
|
|
|
|
atype = DB_LOCK_DEFAULT;
|
|
home = logfile = NULL;
|
|
usecs = 0;
|
|
flags = 0;
|
|
verbose = 0;
|
|
while ((ch = getopt(argc, argv, "a:h:L:t:vw")) != EOF)
|
|
switch (ch) {
|
|
case 'a':
|
|
switch (optarg[0]) {
|
|
case 'o':
|
|
atype = DB_LOCK_OLDEST;
|
|
break;
|
|
case 'y':
|
|
atype = DB_LOCK_YOUNGEST;
|
|
break;
|
|
default:
|
|
usage();
|
|
/* NOTREACHED */
|
|
}
|
|
if (optarg[1] != '\0')
|
|
usage();
|
|
break;
|
|
case 'h':
|
|
home = optarg;
|
|
break;
|
|
case 'L':
|
|
logfile = optarg;
|
|
break;
|
|
case 't':
|
|
get_long(optarg, 1, LONG_MAX, &usecs);
|
|
usecs *= 1000000;
|
|
break;
|
|
case 'v':
|
|
verbose = 1;
|
|
break;
|
|
case 'w':
|
|
LF_SET(DB_LOCK_CONFLICT);
|
|
break;
|
|
case '?':
|
|
default:
|
|
usage();
|
|
}
|
|
argc -= optind;
|
|
argv += optind;
|
|
|
|
if (argc != 0)
|
|
usage();
|
|
|
|
if (usecs == 0 && !LF_ISSET(DB_LOCK_CONFLICT)) {
|
|
warnx("at least one of -t and -w must be specified");
|
|
usage();
|
|
}
|
|
|
|
/*
|
|
* We detect every 100ms (100000 us) when we're running in
|
|
* DB_LOCK_CONFLICT mode.
|
|
*/
|
|
if (usecs == 0)
|
|
usecs = 100000;
|
|
|
|
/* Initialize the deadlock detector by opening the lock manager. */
|
|
dbenv = db_init(home, verbose);
|
|
|
|
if (logfile != NULL && logpid(logfile, 1)) {
|
|
(void)db_appexit(dbenv);
|
|
return (1);
|
|
}
|
|
|
|
while (!interrupted) {
|
|
if (dbenv->db_verbose != 0) {
|
|
time(&now);
|
|
__db_err(dbenv, "Running at %.24s", ctime(&now));
|
|
}
|
|
|
|
if ((errno = lock_detect(dbenv->lk_info, flags, atype)) != 0)
|
|
break;
|
|
|
|
/* Make a pass every "usecs" usecs. */
|
|
(void)__db_sleep(0, usecs);
|
|
}
|
|
|
|
if (logfile != NULL)
|
|
(void)logpid(logfile, 0);
|
|
|
|
if (interrupted) {
|
|
(void)signal(interrupted, SIG_DFL);
|
|
(void)raise(interrupted);
|
|
/* NOTREACHED */
|
|
}
|
|
|
|
return (db_appexit(dbenv));
|
|
}
|
|
|
|
DB_ENV *
|
|
db_init(home, verbose)
|
|
char *home;
|
|
int verbose;
|
|
{
|
|
DB_ENV *dbenv;
|
|
|
|
if ((dbenv = (DB_ENV *)calloc(sizeof(DB_ENV), 1)) == NULL) {
|
|
errno = ENOMEM;
|
|
err(1, NULL);
|
|
}
|
|
dbenv->db_errfile = stderr;
|
|
dbenv->db_errpfx = progname;
|
|
dbenv->db_verbose = verbose;
|
|
|
|
if ((errno = db_appinit(home,
|
|
NULL, dbenv, DB_INIT_LOCK | DB_USE_ENVIRON)) != 0)
|
|
err(1, "db_appinit");
|
|
|
|
siginit();
|
|
|
|
return (dbenv);
|
|
}
|
|
|
|
/*
|
|
* logpid --
|
|
* Log that we're running.
|
|
*/
|
|
int
|
|
logpid(fname, is_open)
|
|
char *fname;
|
|
int is_open;
|
|
{
|
|
FILE *fp;
|
|
time_t now;
|
|
|
|
if (is_open) {
|
|
if ((fp = fopen(fname, "w")) == NULL) {
|
|
warn("%s", fname);
|
|
return (1);
|
|
}
|
|
(void)time(&now);
|
|
fprintf(fp,
|
|
"%.24s: %lu %s", progname, (u_long)getpid(), ctime(&now));
|
|
fclose(fp);
|
|
} else
|
|
(void)remove(fname);
|
|
return (0);
|
|
}
|
|
|
|
/*
|
|
* siginit --
|
|
* Initialize the set of signals for which we want to clean up.
|
|
* Generally, we try not to leave the shared regions locked if
|
|
* we can.
|
|
*/
|
|
void
|
|
siginit()
|
|
{
|
|
#ifdef SIGHUP
|
|
(void)signal(SIGHUP, onint);
|
|
#endif
|
|
(void)signal(SIGINT, onint);
|
|
#ifdef SIGKILL
|
|
(void)signal(SIGKILL, onint);
|
|
#endif
|
|
(void)signal(SIGTERM, onint);
|
|
}
|
|
|
|
/*
|
|
* oninit --
|
|
* Interrupt signal handler.
|
|
*/
|
|
void
|
|
onint(signo)
|
|
int signo;
|
|
{
|
|
if ((interrupted = signo) == 0)
|
|
interrupted = SIGINT;
|
|
}
|
|
|
|
void
|
|
usage()
|
|
{
|
|
(void)fprintf(stderr,
|
|
"usage: db_deadlock [-vw] [-a m | o | y] [-h home] [-L file] [-t sec]\n");
|
|
exit(1);
|
|
}
|