diff options
author | Ulrich Drepper <drepper@redhat.com> | 1997-09-30 17:10:40 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 1997-09-30 17:10:40 +0000 |
commit | a5a0310d8e9d7176bb17e91c916272006a871016 (patch) | |
tree | b922b764878596e6ee42ae84cc315ecaaac00505 /db2/log | |
parent | a2b08ee54130cf3a74655856e6ca6c29874a9df2 (diff) | |
download | glibc-a5a0310d8e9d7176bb17e91c916272006a871016.tar.gz glibc-a5a0310d8e9d7176bb17e91c916272006a871016.tar.xz glibc-a5a0310d8e9d7176bb17e91c916272006a871016.zip |
Update. cvs/libc-ud-970930
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>.
Diffstat (limited to 'db2/log')
-rw-r--r-- | db2/log/log.c | 104 | ||||
-rw-r--r-- | db2/log/log_archive.c | 76 | ||||
-rw-r--r-- | db2/log/log_auto.c | 4 | ||||
-rw-r--r-- | db2/log/log_get.c | 9 | ||||
-rw-r--r-- | db2/log/log_put.c | 23 | ||||
-rw-r--r-- | db2/log/log_register.c | 11 |
6 files changed, 136 insertions, 91 deletions
diff --git a/db2/log/log.c b/db2/log/log.c index d3e5183588..893c1ee402 100644 --- a/db2/log/log.c +++ b/db2/log/log.c @@ -7,7 +7,7 @@ #include "config.h" #ifndef lint -static const char sccsid[] = "@(#)log.c 10.25 (Sleepycat) 8/27/97"; +static const char sccsid[] = "@(#)log.c 10.27 (Sleepycat) 9/23/97"; #endif /* not lint */ #ifndef NO_SYSTEM_INCLUDES @@ -29,7 +29,7 @@ static const char sccsid[] = "@(#)log.c 10.25 (Sleepycat) 8/27/97"; #include "txn_auto.h" #include "common_ext.h" -static int __log_recover __P((DB_ENV *, DB_LOG *)); +static int __log_recover __P((DB_LOG *)); /* * log_open -- @@ -70,14 +70,15 @@ log_open(path, flags, mode, dbenv, lpp) if ((dblp = (DB_LOG *)calloc(1, sizeof(DB_LOG))) == NULL) return (ENOMEM); + if (path != NULL && (dblp->dir = strdup(path)) == NULL) { + free(dblp); + return (ENOMEM); + } + dblp->dbenv = dbenv; dblp->lfd = -1; ZERO_LSN(dblp->c_lsn); dblp->c_fd = -1; - if (LF_ISSET(DB_THREAD)) { - F_SET(dblp, DB_AM_THREAD); - (void)__db_mutex_init(&dblp->mutex, -1); - } /* * The log region isn't fixed size because we store the registered @@ -114,7 +115,7 @@ retry: if (LF_ISSET(DB_CREATE)) { newregion = 1; } else if (ret != EEXIST) - return (ret); + goto err; } /* If we didn't or couldn't create the region, try and join it. */ @@ -129,7 +130,7 @@ retry: if (LF_ISSET(DB_CREATE)) { (void)__db_sleep(1, 0); goto retry; } - return (ret); + goto err; } /* Set up the common information. */ @@ -137,19 +138,49 @@ retry: if (LF_ISSET(DB_CREATE)) { dblp->addr = (u_int8_t *)dblp->maddr + sizeof(LOG); dblp->fd = fd; + /* Initialize thread information. */ + if (LF_ISSET(DB_THREAD)) { + F_SET(dblp, DB_AM_THREAD); + + if (!newregion) + LOCK_LOGREGION(dblp); + if ((ret = __db_shalloc(dblp->addr, + sizeof(db_mutex_t), MUTEX_ALIGNMENT, &dblp->mutexp)) == 0) + (void)__db_mutex_init(dblp->mutexp, -1); + if (!newregion) + UNLOCK_LOGREGION(dblp); + if (ret != 0) { + (void)log_close(dblp); + if (newregion) + (void)log_unlink(path, 1, dbenv); + return (ret); + } + } + /* * If doing recovery, try and recover any previous log files * before releasing the lock. */ if (newregion) { - if ((ret = __log_recover(dbenv, dblp)) != 0) { - log_unlink(path, 1, dbenv); + ret = __log_recover(dblp); + UNLOCK_LOGREGION(dblp); + + if (ret != 0) { + (void)log_close(dblp); + (void)log_unlink(path, 1, dbenv); return (ret); } - UNLOCK_LOGREGION(dblp); } *lpp = dblp; return (0); + +err: /* + * We never get here with an allocated thread-mutex, so we do + * not have to worry about freeing it. + */ + FREE(dblp, sizeof(DB_LOG)); + return (ret); + } /* @@ -157,8 +188,7 @@ retry: if (LF_ISSET(DB_CREATE)) { * Recover a log. */ static int -__log_recover(dbenv, dblp) - DB_ENV *dbenv; +__log_recover(dblp) DB_LOG *dblp; { DBT dbt; @@ -173,14 +203,14 @@ __log_recover(dbenv, dblp) * Find a log file. If none exist, we simply return, leaving * everything initialized to a new log. */ - if ((ret = __log_find(dbenv, lp, &cnt)) != 0) + if ((ret = __log_find(dblp, &cnt)) != 0) return (ret); if (cnt == 0) return (0); /* We have a log file name, find the last one. */ while (cnt < MAXLFNAME) - if (__log_valid(dbenv, lp, ++cnt) != 0) { + if (__log_valid(dblp, lp, ++cnt) != 0) { --cnt; break; } @@ -263,7 +293,7 @@ __log_recover(dbenv, dblp) lp->c_lsn.offset = 0; } - __db_err(dbenv, + __db_err(dblp->dbenv, "Recovering the log: last valid LSN: file: %lu offset %lu", (u_long)lp->lsn.file, (u_long)lp->lsn.offset); @@ -277,12 +307,11 @@ __log_recover(dbenv, dblp) * __log_find -- * Try to find a log file. * - * PUBLIC: int __log_find __P((DB_ENV *, LOG *, int *)); + * PUBLIC: int __log_find __P((DB_LOG *, int *)); */ int -__log_find(dbenv, lp, valp) - DB_ENV *dbenv; - LOG *lp; +__log_find(dblp, valp) + DB_LOG *dblp; int *valp; { int cnt, fcnt, logval, ret; @@ -290,7 +319,7 @@ __log_find(dbenv, lp, valp) char **names, *p, *q; /* Find the directory name. */ - if ((ret = __log_name(dbenv, 1, &p)) != 0) + if ((ret = __log_name(dblp, 1, &p)) != 0) return (ret); if ((q = __db_rpath(p)) == NULL) dir = PATH_DOT; @@ -300,7 +329,7 @@ __log_find(dbenv, lp, valp) } /* Get the list of file names. */ - ret = __db_dir(dbenv, dir, &names, &fcnt); + ret = __db_dir(dblp->dbenv, dir, &names, &fcnt); FREES(p); if (ret != 0) return (ret); @@ -314,14 +343,14 @@ __log_find(dbenv, lp, valp) if (strncmp(names[cnt], "log.", sizeof("log.") - 1) == 0) { logval = atoi(names[cnt] + 4); if (logval != 0 && - __log_valid(dbenv, lp, logval) == 0) { + __log_valid(dblp, dblp->lp, logval) == 0) { *valp = logval; break; } } /* Discard the list. */ - __db_dirf(dbenv, names, fcnt); + __db_dirf(dblp->dbenv, names, fcnt); return (ret); } @@ -330,11 +359,11 @@ __log_find(dbenv, lp, valp) * log_valid -- * Validate a log file. * - * PUBLIC: int __log_valid __P((DB_ENV *, LOG *, int)); + * PUBLIC: int __log_valid __P((DB_LOG *, LOG *, int)); */ int -__log_valid(dbenv, lp, cnt) - DB_ENV *dbenv; +__log_valid(dblp, lp, cnt) + DB_LOG *dblp; LOG *lp; int cnt; { @@ -343,7 +372,7 @@ __log_valid(dbenv, lp, cnt) int fd, ret; char *p; - if ((ret = __log_name(dbenv, cnt, &p)) != 0) + if ((ret = __log_name(dblp, cnt, &p)) != 0) return (ret); fd = -1; @@ -357,7 +386,7 @@ __log_valid(dbenv, lp, cnt) ret = EIO; if (fd != -1) { (void)__db_close(fd); - __db_err(dbenv, + __db_err(dblp->dbenv, "Ignoring log file: %s: %s", p, strerror(ret)); } goto err; @@ -365,14 +394,14 @@ __log_valid(dbenv, lp, cnt) (void)__db_close(fd); if (persist.magic != DB_LOGMAGIC) { - __db_err(dbenv, + __db_err(dblp->dbenv, "Ignoring log file: %s: magic number %lx, not %lx", p, (u_long)persist.magic, (u_long)DB_LOGMAGIC); ret = EINVAL; goto err; } if (persist.version < DB_LOGOLDVER || persist.version > DB_LOGVERSION) { - __db_err(dbenv, + __db_err(dblp->dbenv, "Ignoring log file: %s: unsupported log version %lu", p, (u_long)persist.version); ret = EINVAL; @@ -401,6 +430,13 @@ log_close(dblp) ret = 0; + /* Discard the per-thread pointer. */ + if (dblp->mutexp != NULL) { + LOCK_LOGREGION(dblp); + __db_shalloc_free(dblp->addr, dblp->mutexp); + UNLOCK_LOGREGION(dblp); + } + /* Close the region. */ if ((t_ret = __db_rclose(dblp->dbenv, dblp->fd, dblp->maddr)) != 0 && ret == 0) @@ -414,10 +450,12 @@ log_close(dblp) if (dblp->c_fd != -1 && (t_ret = __db_close(dblp->c_fd)) != 0 && ret == 0) ret = t_ret; - - /* Free the structure. */ if (dblp->dbentry != NULL) FREE(dblp->dbentry, (dblp->dbentry_cnt * sizeof(DB_ENTRY))); + if (dblp->dir != NULL) + FREES(dblp->dir); + + /* Free the structure. */ FREE(dblp, sizeof(DB_LOG)); return (ret); diff --git a/db2/log/log_archive.c b/db2/log/log_archive.c index 0d6c3f2bea..6904a2c726 100644 --- a/db2/log/log_archive.c +++ b/db2/log/log_archive.c @@ -8,7 +8,7 @@ #include "config.h" #ifndef lint -static const char sccsid[] = "@(#)log_archive.c 10.23 (Sleepycat) 8/23/97"; +static const char sccsid[] = "@(#)log_archive.c 10.26 (Sleepycat) 9/23/97"; #endif /* not lint */ #ifndef NO_SYSTEM_INCLUDES @@ -27,18 +27,18 @@ static const char sccsid[] = "@(#)log_archive.c 10.23 (Sleepycat) 8/23/97"; #include "clib_ext.h" #include "common_ext.h" -static int absname __P((char *, char *, char **)); -static int build_data __P((DB_LOG *, char *, char ***, void *(*)(size_t))); -static int cmpfunc __P((const void *, const void *)); -static int usermem __P((char ***, void *(*)(size_t))); +static int __absname __P((char *, char *, char **)); +static int __build_data __P((DB_LOG *, char *, char ***, void *(*)(size_t))); +static int __cmpfunc __P((const void *, const void *)); +static int __usermem __P((char ***, void *(*)(size_t))); /* * log_archive -- * Supporting function for db_archive(1). */ int -log_archive(logp, listp, flags, db_malloc) - DB_LOG *logp; +log_archive(dblp, listp, flags, db_malloc) + DB_LOG *dblp; char ***listp; int flags; void *(*db_malloc) __P((size_t)); @@ -54,10 +54,10 @@ log_archive(logp, listp, flags, db_malloc) #define OKFLAGS (DB_ARCH_ABS | DB_ARCH_DATA | DB_ARCH_LOG) if (flags != 0) { if ((ret = - __db_fchk(logp->dbenv, "log_archive", flags, OKFLAGS)) != 0) + __db_fchk(dblp->dbenv, "log_archive", flags, OKFLAGS)) != 0) return (ret); if ((ret = - __db_fcchk(logp->dbenv, + __db_fcchk(dblp->dbenv, "log_archive", flags, DB_ARCH_DATA, DB_ARCH_LOG)) != 0) return (ret); } @@ -68,7 +68,7 @@ log_archive(logp, listp, flags, db_malloc) * but that's just not possible. */ if (LF_ISSET(DB_ARCH_ABS)) { - __set_errno(0); + __set_errno (0); if ((pref = getcwd(buf, sizeof(buf))) == NULL) return (errno == 0 ? ENOMEM : errno); } else @@ -76,19 +76,19 @@ log_archive(logp, listp, flags, db_malloc) switch (LF_ISSET(~DB_ARCH_ABS)) { case DB_ARCH_DATA: - return (build_data(logp, pref, listp, db_malloc)); + return (__build_data(dblp, pref, listp, db_malloc)); case DB_ARCH_LOG: memset(&rec, 0, sizeof(rec)); - if (F_ISSET(logp, DB_AM_THREAD)) + if (F_ISSET(dblp, DB_AM_THREAD)) F_SET(&rec, DB_DBT_MALLOC); - if ((ret = log_get(logp, &stable_lsn, &rec, DB_LAST)) != 0) + if ((ret = log_get(dblp, &stable_lsn, &rec, DB_LAST)) != 0) return (ret); - if (F_ISSET(logp, DB_AM_THREAD)) + if (F_ISSET(dblp, DB_AM_THREAD)) free(rec.data); fnum = stable_lsn.file; break; case 0: - if ((ret = __log_findckp(logp, &stable_lsn)) != 0) { + if ((ret = __log_findckp(dblp, &stable_lsn)) != 0) { if (ret != DB_NOTFOUND) return (ret); *listp = NULL; @@ -108,7 +108,7 @@ log_archive(logp, listp, flags, db_malloc) /* Build an array of the file names. */ for (n = 0; fnum > 0; --fnum) { - if ((ret = __log_name(logp->dbenv, fnum, &name)) != 0) + if ((ret = __log_name(dblp, fnum, &name)) != 0) goto err; if (__db_exists(name, NULL) != 0) break; @@ -123,7 +123,7 @@ log_archive(logp, listp, flags, db_malloc) } if (LF_ISSET(DB_ARCH_ABS)) { - if ((ret = absname(pref, name, &array[n])) != 0) + if ((ret = __absname(pref, name, &array[n])) != 0) goto err; FREES(name); } else if ((p = __db_rpath(name)) != NULL) { @@ -146,10 +146,10 @@ log_archive(logp, listp, flags, db_malloc) } /* Sort the list. */ - qsort(array, (size_t)n, sizeof(char *), cmpfunc); + qsort(array, (size_t)n, sizeof(char *), __cmpfunc); /* Rework the memory. */ - if ((ret = usermem(&array, db_malloc)) != 0) + if ((ret = __usermem(&array, db_malloc)) != 0) goto err; *listp = array; @@ -164,12 +164,12 @@ err: if (array != NULL) { } /* - * build_data -- + * __build_data -- * Build a list of datafiles for return. */ static int -build_data(logp, pref, listp, db_malloc) - DB_LOG *logp; +__build_data(dblp, pref, listp, db_malloc) + DB_LOG *dblp; char *pref, ***listp; void *(*db_malloc) __P((size_t)); { @@ -187,19 +187,19 @@ build_data(logp, pref, listp, db_malloc) array[0] = NULL; memset(&rec, 0, sizeof(rec)); - if (F_ISSET(logp, DB_AM_THREAD)) + if (F_ISSET(dblp, DB_AM_THREAD)) F_SET(&rec, DB_DBT_MALLOC); - for (n = 0, ret = log_get(logp, &lsn, &rec, DB_FIRST); - ret == 0; ret = log_get(logp, &lsn, &rec, DB_NEXT)) { + for (n = 0, ret = log_get(dblp, &lsn, &rec, DB_FIRST); + ret == 0; ret = log_get(dblp, &lsn, &rec, DB_NEXT)) { if (rec.size < sizeof(rectype)) { ret = EINVAL; - __db_err(logp->dbenv, "log_archive: bad log record"); + __db_err(dblp->dbenv, "log_archive: bad log record"); goto lg_free; } memcpy(&rectype, rec.data, sizeof(rectype)); if (rectype != DB_log_register) { - if (F_ISSET(logp, DB_AM_THREAD)) { + if (F_ISSET(dblp, DB_AM_THREAD)) { free(rec.data); rec.data = NULL; } @@ -207,7 +207,7 @@ build_data(logp, pref, listp, db_malloc) } if ((ret = __log_register_read(rec.data, &argp)) != 0) { ret = EINVAL; - __db_err(logp->dbenv, + __db_err(dblp->dbenv, "log_archive: unable to read log record"); goto lg_free; } @@ -231,7 +231,7 @@ lg_free: if (F_ISSET(&rec, DB_DBT_MALLOC) && rec.data != NULL) array[++n] = NULL; free(argp); - if (F_ISSET(logp, DB_AM_THREAD)) { + if (F_ISSET(dblp, DB_AM_THREAD)) { free(rec.data); rec.data = NULL; } @@ -245,7 +245,7 @@ lg_free: if (F_ISSET(&rec, DB_DBT_MALLOC) && rec.data != NULL) } /* Sort the list. */ - qsort(array, (size_t)n, sizeof(char *), cmpfunc); + qsort(array, (size_t)n, sizeof(char *), __cmpfunc); /* * Build the real pathnames, discarding nonexistent files and @@ -268,7 +268,7 @@ lg_free: if (F_ISSET(&rec, DB_DBT_MALLOC) && rec.data != NULL) } /* Get the real name. */ - if ((ret = __db_appname(logp->dbenv, + if ((ret = __db_appname(dblp->dbenv, DB_APP_DATA, NULL, array[last], NULL, &real_name)) != 0) goto err2; @@ -284,7 +284,7 @@ lg_free: if (F_ISSET(&rec, DB_DBT_MALLOC) && rec.data != NULL) FREES(array[last]); array[last] = NULL; if (pref != NULL) { - ret = absname(pref, real_name, &array[last]); + ret = __absname(pref, real_name, &array[last]); FREES(real_name); if (ret != 0) goto err2; @@ -302,7 +302,7 @@ lg_free: if (F_ISSET(&rec, DB_DBT_MALLOC) && rec.data != NULL) array[last] = NULL; /* Rework the memory. */ - if ((ret = usermem(&array, db_malloc)) != 0) + if ((ret = __usermem(&array, db_malloc)) != 0) goto err1; *listp = array; @@ -327,11 +327,11 @@ err1: if (array != NULL) { } /* - * absname -- + * __absname -- * Return an absolute path name for the file. */ static int -absname(pref, name, newnamep) +__absname(pref, name, newnamep) char *pref, *name, **newnamep; { size_t l_pref, l_name; @@ -355,12 +355,12 @@ absname(pref, name, newnamep) } /* - * usermem -- + * __usermem -- * Create a single chunk of memory that holds the returned information. * If the user has their own malloc routine, use it. */ static int -usermem(listp, func) +__usermem(listp, func) char ***listp; void *(*func) __P((size_t)); { @@ -406,7 +406,7 @@ usermem(listp, func) } static int -cmpfunc(p1, p2) +__cmpfunc(p1, p2) const void *p1, *p2; { return (strcmp(*((char **)p1), *((char **)p2))); diff --git a/db2/log/log_auto.c b/db2/log/log_auto.c index 59400087ca..ea88a7bff9 100644 --- a/db2/log/log_auto.c +++ b/db2/log/log_auto.c @@ -121,7 +121,7 @@ __log_register_print(notused1, dbtp, lsnp, notused3, notused4) notused3 = 0; notused4 = NULL; - if((ret = __log_register_read(dbtp->data, &argp)) != 0) + if ((ret = __log_register_read(dbtp->data, &argp)) != 0) return (ret); printf("[%lu][%lu]log_register: rec: %lu txnid %lx prevlsn [%lu][%lu]\n", (u_long)lsnp->file, @@ -269,7 +269,7 @@ __log_unregister_print(notused1, dbtp, lsnp, notused3, notused4) notused3 = 0; notused4 = NULL; - if((ret = __log_unregister_read(dbtp->data, &argp)) != 0) + if ((ret = __log_unregister_read(dbtp->data, &argp)) != 0) return (ret); printf("[%lu][%lu]log_unregister: rec: %lu txnid %lx prevlsn [%lu][%lu]\n", (u_long)lsnp->file, diff --git a/db2/log/log_get.c b/db2/log/log_get.c index 54a58c75fc..3f6df6c33c 100644 --- a/db2/log/log_get.c +++ b/db2/log/log_get.c @@ -7,7 +7,7 @@ #include "config.h" #ifndef lint -static const char sccsid[] = "@(#)log_get.c 10.17 (Sleepycat) 8/27/97"; +static const char sccsid[] = "@(#)log_get.c 10.19 (Sleepycat) 9/23/97"; #endif /* not lint */ #ifndef NO_SYSTEM_INCLUDES @@ -145,7 +145,7 @@ __log_get(dblp, alsn, dbt, flags, silent) * Find any log file. Note, we may have only entered records * in the buffer, and not yet written a log file. */ - if ((ret = __log_find(dblp->dbenv, lp, &cnt)) != 0) { + if ((ret = __log_find(dblp, &cnt)) != 0) { __db_err(dblp->dbenv, "log_get: unable to find the first record: no log files found."); goto err2; @@ -157,7 +157,7 @@ __log_get(dblp, alsn, dbt, flags, silent) /* Now go backwards to find the smallest one. */ for (; cnt > 1; --cnt) - if (__log_valid(dblp->dbenv, NULL, cnt) != 0) { + if (__log_valid(dblp, NULL, cnt) != 0) { ++cnt; break; } @@ -223,7 +223,7 @@ retry: * Acquire a file descriptor. */ if (dblp->c_fd == -1) { - if ((ret = __log_name(dblp->dbenv, nlsn.file, &np)) != 0) + if ((ret = __log_name(dblp, nlsn.file, &np)) != 0) goto err1; if ((ret = __db_fdopen(np, DB_RDONLY | DB_SEQUENTIAL, DB_RDONLY | DB_SEQUENTIAL, 0, &dblp->c_fd)) != 0) { @@ -319,6 +319,7 @@ retry: &dblp->c_dbt.data, &dblp->c_dbt.ulen, NULL)) != 0) goto err1; free(tbuf); + tbuf = NULL; cksum: if (hdr.cksum != __ham_func4(dbt->data, dbt->size)) { if (!silent) diff --git a/db2/log/log_put.c b/db2/log/log_put.c index db31f9b0e1..225595f33e 100644 --- a/db2/log/log_put.c +++ b/db2/log/log_put.c @@ -7,7 +7,7 @@ #include "config.h" #ifndef lint -static const char sccsid[] = "@(#)log_put.c 10.12 (Sleepycat) 8/20/97"; +static const char sccsid[] = "@(#)log_put.c 10.14 (Sleepycat) 9/23/97"; #endif /* not lint */ #ifndef NO_SYSTEM_INCLUDES @@ -416,7 +416,7 @@ log_file(dblp, lsn, namep, len) LOCK_LOGREGION(dblp); - ret = __log_name(dblp->dbenv, lsn->file, &p); + ret = __log_name(dblp, lsn->file, &p); UNLOCK_LOGREGION(dblp); @@ -453,14 +453,14 @@ __log_newfd(dblp) /* Get the path of the new file and open it. */ dblp->lfname = dblp->lp->lsn.file; - if ((ret = __log_name(dblp->dbenv, dblp->lfname, &p)) != 0) + if ((ret = __log_name(dblp, dblp->lfname, &p)) != 0) return (ret); if ((ret = __db_fdopen(p, DB_CREATE | DB_SEQUENTIAL, DB_CREATE | DB_SEQUENTIAL, dblp->lp->persist.mode, &dblp->lfd)) != 0) __db_err(dblp->dbenv, - "log_put: %s: %s", p, strerror(errno)); + "log_put: %s: %s", p, strerror(ret)); FREES(p); return (ret); } @@ -469,16 +469,17 @@ __log_newfd(dblp) * __log_name -- * Return the log name for a particular file. * - * PUBLIC: int __log_name __P((DB_ENV *, int, char **)); + * PUBLIC: int __log_name __P((DB_LOG *, int, char **)); */ int -__log_name(dbenv, fn, np) - DB_ENV *dbenv; - int fn; - char **np; +__log_name(dblp, fileno, namep) + DB_LOG *dblp; + char **namep; + int fileno; { char name[sizeof(LFNAME) + 10]; - (void)snprintf(name, sizeof(name), LFNAME, fn); - return (__db_appname(dbenv, DB_APP_LOG, NULL, name, NULL, np)); + (void)snprintf(name, sizeof(name), LFNAME, fileno); + return (__db_appname(dblp->dbenv, + DB_APP_LOG, dblp->dir, name, NULL, namep)); } diff --git a/db2/log/log_register.c b/db2/log/log_register.c index 582eab9408..859b1e5bcb 100644 --- a/db2/log/log_register.c +++ b/db2/log/log_register.c @@ -7,7 +7,7 @@ #include "config.h" #ifndef lint -static const char sccsid[] = "@(#)log_register.c 10.10 (Sleepycat) 8/20/97"; +static const char sccsid[] = "@(#)log_register.c 10.11 (Sleepycat) 9/15/97"; #endif /* not lint */ #ifndef NO_SYSTEM_INCLUDES @@ -190,8 +190,13 @@ log_unregister(dblp, fid) SH_TAILQ_REMOVE(&dblp->lp->fq, fnp, q, __fname); __db_shalloc_free(dblp->addr, fnp); - /* Remove from the process local table. */ - __log_rem_logid(dblp, fid); + /* + * Remove from the process local table. If this operation is taking + * place during recovery, then the logid was never added to the table, + * so do not remove it. + */ + if (!F_ISSET(dblp, DB_AM_RECOVER)) + __log_rem_logid(dblp, fid); ret1: UNLOCK_LOGREGION(dblp); |