diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2007-07-30 11:58:31 +0300 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2007-07-30 11:58:31 +0300 |
| commit | cab228435bde1b5496522c03a4ce9840f2ef3701 (patch) | |
| tree | 2c37b65d176e2de097603333f4de071c31eeff3d /db/db_deadlock | |
| parent | 2d07882d45e9e575c00f8f402d4c7271bb65cfe9 (diff) | |
| download | librpm-tizen-cab228435bde1b5496522c03a4ce9840f2ef3701.tar.gz librpm-tizen-cab228435bde1b5496522c03a4ce9840f2ef3701.tar.bz2 librpm-tizen-cab228435bde1b5496522c03a4ce9840f2ef3701.zip | |
Update internal BDB to version 4.6.18.
Diffstat (limited to 'db/db_deadlock')
| -rw-r--r-- | db/db_deadlock/db_deadlock.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/db/db_deadlock/db_deadlock.c b/db/db_deadlock/db_deadlock.c index 4e82bfef5..4d412b659 100644 --- a/db/db_deadlock/db_deadlock.c +++ b/db/db_deadlock/db_deadlock.c @@ -1,10 +1,9 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1996-2006 - * Oracle Corporation. All rights reserved. + * Copyright (c) 1996,2007 Oracle. All rights reserved. * - * $Id: db_deadlock.c,v 12.13 2006/08/26 09:23:00 bostic Exp $ + * $Id: db_deadlock.c,v 12.18 2007/05/17 17:17:42 bostic Exp $ */ #include "db_config.h" @@ -13,7 +12,7 @@ #ifndef lint static const char copyright[] = - "Copyright (c) 1996-2006\nOracle Corporation. All rights reserved.\n"; + "Copyright (c) 1996,2007 Oracle. All rights reserved.\n"; #endif int main __P((int, char *[])); @@ -33,10 +32,10 @@ main(argc, argv) u_int32_t atype; time_t now; u_long secs, usecs; - int ch, exitval, ret, verbose; + int rejected, ch, exitval, ret, verbose; char *home, *logfile, *passwd, *str, time_buf[CTIME_BUFLEN]; - if ((progname = strrchr(argv[0], '/')) == NULL) + if ((progname = __db_rpath(argv[0])) == NULL) progname = argv[0]; else ++progname; @@ -170,10 +169,13 @@ main(argc, argv) "running at %.24s", __db_ctime(&now, time_buf)); } - if ((ret = dbenv->lock_detect(dbenv, 0, atype, NULL)) != 0) { + if ((ret = + dbenv->lock_detect(dbenv, 0, atype, &rejected)) != 0) { dbenv->err(dbenv, ret, "DB_ENV->lock_detect"); goto shutdown; } + if (verbose) + dbenv->errx(dbenv, "rejected %d locks", rejected); /* Make a pass every "secs" secs and "usecs" usecs. */ if (secs == 0 && usecs == 0) |