From cc3fa755128c70f8afc2d604936f33e4d7d652d8 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 12 Nov 1997 00:06:02 +0000 Subject: Update. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1997-11-11 21:30 Ulrich Drepper * include/sys/stat.h: Define stat, fstat, lstat and *64 variants as macros so the the library compiles correctly even without optimization. * io/fstat.c: Undef fstat. * io/fstat64.c: Undef fstat64 * io/lstat.c: Undef lstat. * io/lstat64.c: Undef lstat64 * io/stat.c: Undef stat. * io/stat64.c: Undef stat64 * io/fts.c: Include to get macro definitions. * io/ftw.c: Likewise. * io/getdirname.c: Likewise. * Makefile (install): Run test-installation.pl if possible. * db2/Makefile: Update from db-2.3.12. * db2/db.h: Likewise. * db2/db_int.h: Likewise. * db2/btree/bt_cursor.c: Likewise. * db2/btree/bt_delete.c: Likewise. * db2/btree/bt_open.c: Likewise. * db2/btree/bt_put.c: Likewise. * db2/btree/bt_rec.c: Likewise. * db2/btree/bt_recno.c: Likewise. * db2/btree/bt_search.c: Likewise. * db2/btree/bt_split.c: Likewise. * db2/btree/bt_stat.c: Likewise. * db2/btree/btree.src: Likewise. * db2/btree/btree_auto.c: Likewise. * db2/btree/bt_cursor.c: Likewise. * db2/btree/bt_delete.c: Likewise. * db2/btree/bt_open.c: Likewise. * db2/btree/bt_put.c: Likewise. * db2/btree/bt_rec.c: Likewise. * db2/btree/bt_recno.c: Likewise. * db2/btree/bt_search.c: Likewise. * db2/btree/bt_split.c: Likewise. * db2/btree/bt_stat.c: Likewise. * db2/btree/btree.src: Likewise. * db2/btree/btree_auto.c: Likewise. * db2/common/db_appinit.c: Likewise. * db2/common/db_apprec.c: Likewise. * db2/common/db_byteorder.c: Likewise. * db2/common/db_region.c: Likewise. * db2/db/db.c: Likewise * db2/db/db.src: Likewise * db2/db/db_auto.c: Likewise * db2/db/db_dispatch.c: Likewise * db2/db/db_dup.c: Likewise * db2/db/db_overflow.c: Likewise * db2/db/db_pr.c: Likewise * db2/db/db_rec.c: Likewise * db2/db/db_ret.c: Likewise * db2/db/db_thread.c: Likewise * db2/db185/db185.c: Likewise. * db2/hash/hash.c: Likewise. * db2/hash/hash.src: Likewise. * db2/hash/hash_auto.c: Likewise. * db2/hash/hash_dup.c: Likewise. * db2/hash/hash_page.c: Likewise. * db2/hash/hash_rec.c: Likewise. * db2/include/btree_auto.h: Likewise. * db2/include/btree_ext.h: Likewise. * db2/include/clib_ext.h: Likewise. * db2/include/common_ext.h: Likewise. * db2/include/db.h.src: Likewise. * db2/include/db_am.h: Likewise. * db2/include/db_auto.h: Likewise. * db2/include/db_cxx.h: Likewise. * db2/include/db_ext.h: Likewise. * db2/include/db_int.h.src: Likewise. * db2/include/hash.h: Likewise. * db2/include/hash_auto.h: Likewise. * db2/include/hash_ext.h: Likewise. * db2/include/lock.h: Likewise. * db2/include/lock_ext.h: Likewise. * db2/include/log.h: Likewise. * db2/include/log_ext.h: Likewise. * db2/include/mp.h: Likewise. * db2/include/mp_ext.h: Likewise. * db2/include/mutex_ext.h: Likewise. * db2/include/os_ext.h: Likewise. * db2/include/os_func.h: Likewise. * db2/include/txn.h: Likewise. * db2/include/txn_ext.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_findckp.c: Likewise. * db2/log/log_get.c: Likewise. * db2/log/log_put.c: Likewise. * db2/log/log_rec.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/mp/mp_pr.c: Likewise. * db2/mp/mp_region.c: Likewise. * db2/mp/mp_sync.c: Likewise. * db2/mutex/mutex.c: Likewise. * db2/os/os_abs.c: Likewise. * db2/os/os_dir.c: Likewise. * db2/os/os_fid.c: Likewise. * db2/os/os_fsync.c: Likewise. * db2/os/os_func.c: Likewise. * db2/os/os_map.c: Likewise. * db2/os/os_oflags.c: Likewise. * db2/os/os_open.c: Likewise. * db2/os/os_rpath.c: Likewise. * db2/os/os_rw.c: Likewise. * db2/os/os_seek.c: Likewise. * db2/os/os_sleep.c: Likewise. * db2/os/os_stat.c: Likewise. * db2/os/os_unlink.c: Likewise. * db2/progs/db_deadlock/db_deadlock.c: Likewise. * db2/progs/db_dump/db_dump.c: Likewise. * db2/progs/db_load/db_load.c: Likewise. * db2/progs/db_recover/db_recover.c: Likewise. * db2/progs/db_stat/db_stat.c: Likewise. * db2/txn/txn.c: Likewise. * db2/txn/txn_auto.c: Likewise. * db2/txn/txn_rec.c: Likewise. * db2/os/db_os_abs.c: Removed. * db2/os/db_os_dir.c: Removed. * db2/os/db_os_fid.c: Removed. * db2/os/db_os_lseek.c: Removed. * db2/os/db_os_mmap.c: Removed. * db2/os/db_os_open.c: Removed. * db2/os/db_os_rw.c: Removed. * db2/os/db_os_sleep.c: Removed. * db2/os/db_os_stat.c: Removed. * db2/os/db_os_unlink.c: Removed. * libio/stdio.h (fopen): Add __restrict to parameters. * manual/process.texi (system): Describe behaviour for NULL argument. * stdio-common/printf-parse.h: Parse hh modifier. * stdio-common/vfprintf.c: Handle hh modifier. * stdio-common/vfscanf.c: Likewise. * manual/stdio.texi: Describe hh modifier for scanf/printf. * math/complex.h: Don't define _Imaginary_I, but instead _Complex_I. gcc does no yet know the `imaginary' keyword. * math/test-math.c: Add little test for know gcc bug. * math/tgmath.h: Make complex versions of log10() only available if __USE_GNU. * stdlib/test-canon.c: Fix typo. * sysdeps/generic/setenv.c: Avoid compilation warnings. Reported by Jim Meyering. * sysdeps/generic/bits/errno.h: EILSEQ is an ISO C error number. * sysdeps/mach/hurd/bits/errno.h: Likewise. * sysdeps/standalone/bits/errno.h: Likewise. * sysdeps/unix/sysv/linux/bits/errno.h: Likewise. * sysdeps/i386/i586/memcpy.S: New file. * sysdeps/i386/i586/mempcpy.S: New file. * sysdeps/i386/i586/memset.S: Fix typo. * sysdeps/posix/getcwd.c: Define HAVE_MEMPCPY for _LIBC. Add casts. * sysdeps/posix/system.c: Add comment to explain code. * sysdeps/wordsize-32/inttypes.h: Include for wchar_t. Define PTRDIFF_{MIN,MAX}, SIG_ATOMIC_{MIN,MAX}, SIZE_MAX, WCHAR_{MIN,MAX}, WINT_{MIN,MAX}. Define wcstoimax, wcstoumax. * sysdeps/wordsize-64/inttypes.h: Likewise. * wcsmbs/wchar.h: Define WCHAR_{MIN,MAX} if not already defined. Declare __wcsto{l,ul,ll,ull}_internal only if not already done. * time/Makefile (routines): Add strfxtime. * time/strftime.c: Implement %F and %f format. * time/strfxtime.c: New file. * time/time.h: Define new types and symbols from ISO C 9X. * time/mktime.c: Little comment correction. 1997-11-10 Andreas Jaeger * sysdeps/libm-ieee754/s_sincosl.c: Fix typo. * sysdeps/libm-ieee754/s_tanl.c: Fix typo. * sysdeps/libm-ieee754/s_floorl.c: Correct typos. * sysdeps/libm-ieee754/e_remainderl.c: Replace EXTRACT_LDOUBLE_WORDS by GET_LDOUBLE_WORDS. * sysdeps/libm-ieee754/e_atan2l.c: Replace EXTRACT_LDOUBLE_WORDS by GET_LDOUBLE_WORDS. * sysdeps/libm-ieee754/s_scalbnl.c: Replace ";" by "," for correct variable declaration. * sysdeps/libm-ieee754/s_scalblnl.c: Likewise. * sysdeps/libm-ieee754/s_lrint.c (__lrint): Correct function. * math/libm-test.c (sqrt_test): Add test for sqrt (0.25). (asin_test): Add more test. 1997-11-10 23:34 Ulrich Drepper * sysdeps/libm-ieee754/e_asin.c: Add braces to make code clearer and to not confuse the poor compiler. * sysdeps/libm-ieee754/e_asinf.c: Likewise. Reported by vertex@cagent.com. 1997-11-09 Andreas Schwab * elf/dl-lookup.c (do_lookup): Don't accept the base version if we require a specific one. * libio/oldfreopen.c: Bind old symbols to version GLIBC_2.0. * libio/oldiofopen.c: Likewise. * libio/oldstdfiles.c: Likewise. * libc.map: Export them. 1997-11-10 07:40 H.J. Lu * stdlib/exit.c (exit): Handle recursive calls to exit (). 1997-11-09 Andreas Schwab * sysdeps/m68k/fpu/s_llrint.c: Fixed to take double argument instead of long double. * sysdeps/m68k/fpu/s_llrintf.c: New file. * sysdeps/m68k/fpu/s_llrintl.c: New file. * sysdeps/libm-ieee754/s_llrint.c: Make compilable and fix overflow condition. * sysdeps/libm-ieee754/s_llrintf.c: Fix overflow condition. * sysdeps/libm-ieee754/s_llrintl.c: Likewise. * sysdeps/libm-ieee754/s_llround.c: Likewise. * sysdeps/libm-ieee754/s_llroundf.c: Likewise. * sysdeps/libm-ieee754/s_llroundl.c: Likewise. * sysdeps/libm-ieee754/s_lrint.c: Likewise. * sysdeps/libm-ieee754/s_lrintf.c: Likewise. * sysdeps/libm-ieee754/s_lrintl.c: Likewise. * sysdeps/libm-ieee754/s_lround.c: Likewise. * sysdeps/libm-ieee754/s_lroundf.c: Likewise. * sysdeps/libm-ieee754/s_lroundl.c: Likewise. * math/libm-test.c: Test all three variants of lrint and llrint. Fix typos in lround and llround tests. Add tests for boundary cases for lrint and llround. 1997-11-08 Andreas Schwab * manual/arith.texi: Misc doc fixes. * manual/ctype.texi: Likewise. * manual/pattern.texi: Likewise. * manual/terminal.texi: Likewise. 1997-11-08 Andreas Schwab * sysdeps/unix/sysv/linux/xstatconv.c: Use struct assignment instead of memcpy to let the compiler use whatever it regards as optimal. * sysdeps/unix/sysv/linux/alpha/xstatconv.c: Likewise. 1997-11-08 Andreas Schwab * sysdeps/unix/sysv/linux/Makefile (sysdep_headers) [$(subdir)=misc]: Add sys/prctl.h. * sysdeps/unix/sysv/linux/Dist: Distribute it. 1997-11-08 Andreas Schwab * io/ftwtest-sh: Don't use the unknown which command, instead try pwd as /bin/pwd and /usr/bin/pwd. 1997-11-08 Andreas Schwab * manual/maint.texi (Tools for Installation): Don't recommend broken version 3.76.1 of make. (Porting): Fix wording. 1997-11-06 06:13 H.J. Lu * config.make.in (build-pic-default): New, defined with pic_default. * configure.in (pic_default): New, set to yes if PIC is default. * Makeconfig (CPPFLAGS-.o, CPPFLAGS-.op, CPPFLAGS-.og, CPPFLAGS-.ob): Add -DPIC if $(build-pic-default) is yes. 1997-11-09 18:15 Ulrich Drepper * Makerules (libc.so): Fix typo. * csu/Makefile (CFLAGS-initfini.s): Correctly fix moving function definition. Patch by Zack Weinberg . * stdlib/strtod.c: Handle numbers like 0.0e10000 correctly which produce ±0.0. Reported by Joe Keane . * sysdeps/libm-ieee754/s_ceill.c: Fix typos. * sysdeps/libm-ieee754/s_llrint.c: Correct code, it never worked. 1997-11-06 07:00 H.J. Lu * sysdeps/unix/sysv/i386/i686/time.S: Removed. 1997-11-08 14:07 Thorsten Kukuk * nis/libnsl.map: Add __do_niscall2 for nis_cachemgr. * nis/nis_call.c: Set UDP resend timeout correct. * nis/nss_compat/compat-grp.c: Rewritten to make it faster. * nis/nss_compat/compat-pwd.c: Likewise. * nis/nss_compat/compat-spwd.c: Likewise. * nis/ypclnt.c: Fix UDP resend timeout, fix yp_bind/do_ypcall interaction. * inet/protocols/routed.h: Include sys/socket.h. * inet/protocols/talkd.h: Likewise. * inet/protocols/timed.h: Include rpc/types.h. * sunrpc/rpc/pmap_clnt.h: Include rpc/clnt.h. 1997-11-06 01:39 Ulrich Drepper * Makerules (libc.so): Add missing closing brace. 1997-11-05 Brendan Kehoe * libio.h (__P): Name its arg `p' instead of `params'. This was added solely to work around problems with the definition of __P in the Solaris math.h header. --- db2/lock/lock.c | 16 +++---- db2/lock/lock_deadlock.c | 108 ++++++++++++++++++++++++----------------------- 2 files changed, 61 insertions(+), 63 deletions(-) (limited to 'db2/lock') diff --git a/db2/lock/lock.c b/db2/lock/lock.c index a2a3b20..f1223a9 100644 --- a/db2/lock/lock.c +++ b/db2/lock/lock.c @@ -8,7 +8,7 @@ #include "config.h" #ifndef lint -static const char sccsid[] = "@(#)lock.c 10.36 (Sleepycat) 9/24/97"; +static const char sccsid[] = "@(#)lock.c 10.38 (Sleepycat) 10/25/97"; #endif /* not lint */ #ifndef NO_SYSTEM_INCLUDES @@ -200,7 +200,7 @@ lock_open(path, flags, mode, dbenv, ltp) /* * Create the lock table structure. */ - if ((lt = (DB_LOCKTAB *)calloc(1, sizeof(DB_LOCKTAB))) == NULL) { + if ((lt = (DB_LOCKTAB *)__db_calloc(1, sizeof(DB_LOCKTAB))) == NULL) { __db_err(dbenv, "%s", strerror(ENOMEM)); return (ENOMEM); } @@ -269,7 +269,7 @@ out: if (lt->region != NULL) (void)__db_rclose(lt->dbenv, lt->fd, lt->region); if (LF_ISSET(DB_CREATE)) (void)lock_unlink(path, 1, lt->dbenv); - free(lt); + __db_free(lt); return (ret); } @@ -505,7 +505,7 @@ lock_close(lt) return (ret); /* Free lock table. */ - free(lt); + __db_free(lt); return (0); } @@ -728,8 +728,7 @@ __lock_get_internal(lt, locker, flags, obj, lock_mode, lockp) */ (void)__db_mutex_init(&newl->mutex, MUTEX_LOCK_OFFSET(lt->region, &newl->mutex)); - (void)__db_mutex_lock(&newl->mutex, lt->fd, - lt->dbenv == NULL ? NULL : lt->dbenv->db_yield); + (void)__db_mutex_lock(&newl->mutex, lt->fd); /* * Now, insert the lock onto its locker's list. @@ -760,8 +759,7 @@ __lock_get_internal(lt, locker, flags, obj, lock_mode, lockp) if (lrp->detect != DB_LOCK_NORUN) ret = lock_detect(lt, 0, lrp->detect); - (void)__db_mutex_lock(&newl->mutex, - lt->fd, lt->dbenv == NULL ? NULL : lt->dbenv->db_yield); + (void)__db_mutex_lock(&newl->mutex, lt->fd); LOCK_LOCKREGION(lt); if (newl->status != DB_LSTAT_PENDING) { @@ -975,11 +973,9 @@ __lock_dump_region(lt, flags) #ifndef HAVE_SPINLOCKS printf("Mutex: off %lu", (u_long)lrp->hdr.lock.off); #endif -#ifdef MUTEX_STATISTICS printf(" waits %lu nowaits %lu", (u_long)lrp->hdr.lock.mutex_set_wait, (u_long)lrp->hdr.lock.mutex_set_nowait); -#endif printf("\n%s:%lu\t%s:%lu\t%s:%lu\t%s:%lu\n", "nconflicts ", (u_long)lrp->nconflicts, "nrequests ", (u_long)lrp->nrequests, diff --git a/db2/lock/lock_deadlock.c b/db2/lock/lock_deadlock.c index f947f90..566021f 100644 --- a/db2/lock/lock_deadlock.c +++ b/db2/lock/lock_deadlock.c @@ -11,7 +11,7 @@ static const char copyright[] = "@(#) Copyright (c) 1997\n\ Sleepycat Software Inc. All rights reserved.\n"; -static const char sccsid[] = "@(#)lock_deadlock.c 10.21 (Sleepycat) 9/6/97"; +static const char sccsid[] = "@(#)lock_deadlock.c 10.25 (Sleepycat) 11/1/97"; #endif #ifndef NO_SYSTEM_INCLUDES @@ -50,16 +50,19 @@ typedef struct { int valid; u_int32_t id; DB_LOCK last_lock; + db_pgno_t pgno; } locker_info; static int __dd_abort __P((DB_ENV *, locker_info *)); -static int __dd_build __P((DB_ENV *, u_int32_t **, int *, locker_info **)); -#ifdef DEBUG -static void __dd_debug __P((DB_ENV *, locker_info *, u_int32_t *, int)); -#endif +static int __dd_build + __P((DB_ENV *, u_int32_t **, u_int32_t *, locker_info **)); static u_int32_t *__dd_find __P((u_int32_t *, locker_info *, u_int32_t)); +#ifdef DEBUG +static void __dd_debug __P((DB_ENV *, locker_info *, u_int32_t *, u_int32_t)); +#endif + int lock_detect(lt, flags, atype) DB_LOCKTAB *lt; @@ -68,8 +71,8 @@ lock_detect(lt, flags, atype) { DB_ENV *dbenv; locker_info *idmap; - u_int32_t *bitmap, *deadlock, killid; - int do_pass, i, nlockers, nentries, ret; + u_int32_t *bitmap, *deadlock, i, killid, nentries, nlockers; + int do_pass, ret; /* Validate arguments. */ if ((ret = @@ -77,17 +80,16 @@ lock_detect(lt, flags, atype) return (ret); /* Check if a detector run is necessary. */ - do_pass = 1; dbenv = lt->dbenv; if (LF_ISSET(DB_LOCK_CONFLICT)) { /* Make a pass every time a lock waits. */ LOCK_LOCKREGION(lt); do_pass = dbenv->lk_info->region->need_dd != 0; UNLOCK_LOCKREGION(lt); - } - if (!do_pass) - return (0); + if (!do_pass) + return (0); + } /* Build the waits-for bitmap. */ if ((ret = __dd_build(dbenv, &bitmap, &nlockers, &idmap)) != 0) @@ -118,8 +120,7 @@ lock_detect(lt, flags, atype) if (killid == BAD_KILLID) { __db_err(dbenv, - "warning: could not find %s", - "locker to abort"); + "warning: could not find locker to abort"); break; } @@ -137,11 +138,8 @@ lock_detect(lt, flags, atype) /* * We are trying to calculate the id of the * locker whose entry is indicated by deadlock. - * We know that this is less than nlockers, so - * the cast below is valid. */ - killid = - (u_int32_t)((deadlock - bitmap) / nentries); + killid = (deadlock - bitmap) / nentries; break; case DB_LOCK_YOUNGEST: /* @@ -155,8 +153,7 @@ lock_detect(lt, flags, atype) if (killid == BAD_KILLID) { __db_err(dbenv, - "warning: could not find %s", - "locker to abort"); + "warning: could not find locker to abort"); break; } /* @@ -184,8 +181,8 @@ lock_detect(lt, flags, atype) "warning: unable to abort locker %lx", (u_long)idmap[killid].id); } - free(bitmap); - free(idmap); + __db_free(bitmap); + __db_free(idmap); return (ret); } @@ -197,15 +194,15 @@ lock_detect(lt, flags, atype) static int __dd_build(dbenv, bmp, nlockers, idmap) DB_ENV *dbenv; - u_int32_t **bmp; - int *nlockers; + u_int32_t **bmp, *nlockers; locker_info **idmap; { - DB_LOCKTAB *lt; - DB_LOCKOBJ *op, *lockerp; struct __db_lock *lp; - u_int32_t *bitmap, count, *entryp, i, id, nentries, *tmpmap; + DB_LOCKTAB *lt; + DB_LOCKOBJ *op, *lo, *lockerp; + u_int8_t *pptr; locker_info *id_array; + u_int32_t *bitmap, count, *entryp, i, id, nentries, *tmpmap; int is_first, ret; lt = dbenv->lk_info; @@ -238,24 +235,24 @@ retry: count = lt->region->nlockers; * We can probably save the malloc's between iterations just * reallocing if necessary because count grew by too much. */ - if ((bitmap = (u_int32_t *)calloc((size_t)count, + if ((bitmap = (u_int32_t *)__db_calloc((size_t)count, sizeof(u_int32_t) * nentries)) == NULL) { __db_err(dbenv, "%s", strerror(ENOMEM)); return (ENOMEM); } if ((tmpmap = - (u_int32_t *)calloc(sizeof(u_int32_t), nentries)) == NULL) { + (u_int32_t *)__db_calloc(sizeof(u_int32_t), nentries)) == NULL) { __db_err(dbenv, "%s", strerror(ENOMEM)); - free(bitmap); + __db_free(bitmap); return (ENOMEM); } - if ((id_array = (locker_info *)calloc((size_t)count, + if ((id_array = (locker_info *)__db_calloc((size_t)count, sizeof(locker_info))) == NULL) { __db_err(dbenv, "%s", strerror(ENOMEM)); - free(bitmap); - free(tmpmap); + __db_free(bitmap); + __db_free(tmpmap); return (ENOMEM); } @@ -264,9 +261,9 @@ retry: count = lt->region->nlockers; */ LOCK_LOCKREGION(lt); if (lt->region->nlockers > count) { - free(bitmap); - free(tmpmap); - free(id_array); + __db_free(bitmap); + __db_free(tmpmap); + __db_free(id_array); goto retry; } @@ -326,9 +323,8 @@ retry: count = lt->region->nlockers; lp != NULL; is_first = 0, lp = SH_TAILQ_NEXT(lp, links, __db_lock)) { - if ((ret = __lock_getobj(lt, - lp->holder, NULL, DB_LOCK_LOCKER, &lockerp)) - != 0) { + if ((ret = __lock_getobj(lt, lp->holder, + NULL, DB_LOCK_LOCKER, &lockerp)) != 0) { __db_err(dbenv, "warning unable to find object"); continue; @@ -369,8 +365,16 @@ retry: count = lt->region->nlockers; continue; } lp = SH_LIST_FIRST(&lockerp->heldby, __db_lock); - if (lp != NULL) + if (lp != NULL) { id_array[id].last_lock = LOCK_TO_OFFSET(lt, lp); + lo = (DB_LOCKOBJ *)((u_int8_t *)lp + lp->obj); + pptr = SH_DBT_PTR(&lo->lockobj); + if (lo->lockobj.size >= sizeof(db_pgno_t)) + memcpy(&id_array[id].pgno, pptr, + sizeof(db_pgno_t)); + else + id_array[id].pgno = 0; + } } /* Pass complete, reset the deadlock detector bit. */ @@ -384,21 +388,20 @@ retry: count = lt->region->nlockers; *nlockers = id; *idmap = id_array; *bmp = bitmap; - free(tmpmap); + __db_free(tmpmap); return (0); } static u_int32_t * __dd_find(bmp, idmap, nlockers) - u_int32_t *bmp; + u_int32_t *bmp, nlockers; locker_info *idmap; - u_int32_t nlockers; { u_int32_t i, j, nentries, *mymap, *tmpmap; /* - * For each locker, or in the bits from the lockers - * on which that locker is waiting. + * For each locker, OR in the bits from the lockers on which that + * locker is waiting. */ nentries = ALIGN(nlockers, 32) / 32; for (mymap = bmp, i = 0; i < nlockers; i++, mymap += nentries) { @@ -422,9 +425,9 @@ __dd_abort(dbenv, info) DB_ENV *dbenv; locker_info *info; { + struct __db_lock *lockp; DB_LOCKTAB *lt; DB_LOCKOBJ *lockerp, *sh_obj; - struct __db_lock *lockp; int ret; lt = dbenv->lk_info; @@ -459,19 +462,17 @@ static void __dd_debug(dbenv, idmap, bitmap, nlockers) DB_ENV *dbenv; locker_info *idmap; - u_int32_t *bitmap; - int nlockers; + u_int32_t *bitmap, nlockers; { - u_int32_t *mymap; - int i, j, nentries; + u_int32_t i, j, *mymap, nentries; char *msgbuf; __db_err(dbenv, "Waitsfor array"); __db_err(dbenv, "waiter\twaiting on"); /* - * Alloc space to print 10 bytes per item waited on. + * Allocate space to print 10 bytes per item waited on. */ - if ((msgbuf = (char *)malloc((nlockers + 1) * 10 + 64)) == NULL) { + if ((msgbuf = (char *)__db_malloc((nlockers + 1) * 10 + 64)) == NULL) { __db_err(dbenv, "%s", strerror(ENOMEM)); return; } @@ -480,7 +481,8 @@ __dd_debug(dbenv, idmap, bitmap, nlockers) for (mymap = bitmap, i = 0; i < nlockers; i++, mymap += nentries) { if (!idmap[i].valid) continue; - sprintf(msgbuf, "%lx\t\t", (u_long)idmap[i].id);/* Waiter. */ + sprintf(msgbuf, /* Waiter. */ + "%lx/%lu:\t", (u_long)idmap[i].id, (u_long)idmap[i].pgno); for (j = 0; j < nlockers; j++) if (ISSET_MAP(mymap, j)) sprintf(msgbuf, "%s %lx", msgbuf, @@ -490,6 +492,6 @@ __dd_debug(dbenv, idmap, bitmap, nlockers) __db_err(dbenv, msgbuf); } - free(msgbuf); + __db_free(msgbuf); } #endif -- cgit v1.1