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/common/db_appinit.c | 40 ++++++++++-------- db2/common/db_apprec.c | 36 +++++++--------- db2/common/db_byteorder.c | 14 +++---- db2/common/db_region.c | 103 ++++++++++++++++++++++++++++------------------ 4 files changed, 110 insertions(+), 83 deletions(-) (limited to 'db2/common') diff --git a/db2/common/db_appinit.c b/db2/common/db_appinit.c index 51d9262859..74ba9ff426 100644 --- a/db2/common/db_appinit.c +++ b/db2/common/db_appinit.c @@ -8,7 +8,7 @@ #include "config.h" #ifndef lint -static const char sccsid[] = "@(#)db_appinit.c 10.33 (Sleepycat) 8/28/97"; +static const char sccsid[] = "@(#)db_appinit.c 10.36 (Sleepycat) 10/28/97"; #endif /* not lint */ #ifndef NO_SYSTEM_INCLUDES @@ -93,6 +93,10 @@ db_appinit(db_home, db_config, dbenv, flags) LF_ISSET(RECOVERY_FLAGS) != RECOVERY_FLAGS) return (__db_ferr(dbenv, "db_appinit", 1)); + /* Convert the db_appinit(3) flags. */ + if (LF_ISSET(DB_THREAD)) + F_SET(dbenv, DB_ENV_THREAD); + fp = NULL; /* Set the database home. */ @@ -126,7 +130,7 @@ db_appinit(db_home, db_config, dbenv, flags) goto err; /* Indicate that the path names have been set. */ - F_SET(dbenv, DB_APP_INIT); + F_SET(dbenv, DB_ENV_APPINIT); /* * If we are doing recovery, remove all the regions. @@ -300,7 +304,8 @@ __db_appname(dbenv, appname, dir, file, fdp, namep) * return. */ if (file != NULL && __db_abspath(file)) - return ((*namep = (char *)strdup(file)) == NULL ? ENOMEM : 0); + return ((*namep = + (char *)__db_strdup(file)) == NULL ? ENOMEM : 0); if (dir != NULL && __db_abspath(dir)) { a = dir; goto done; @@ -335,7 +340,7 @@ __db_appname(dbenv, appname, dir, file, fdp, namep) */ retry: switch (appname) { case DB_APP_NONE: - if (dbenv == NULL || !F_ISSET(dbenv, DB_APP_INIT)) { + if (dbenv == NULL || !F_ISSET(dbenv, DB_ENV_APPINIT)) { if (dir == NULL) goto tmp; a = dir; @@ -355,7 +360,7 @@ retry: switch (appname) { tmp_create = 1; goto tmp; } - if (dbenv == NULL || !F_ISSET(dbenv, DB_APP_INIT)) + if (dbenv == NULL || !F_ISSET(dbenv, DB_ENV_APPINIT)) a = PATH_DOT; else { a = dbenv->db_home; @@ -367,7 +372,7 @@ retry: switch (appname) { } break; case DB_APP_LOG: - if (dbenv == NULL || !F_ISSET(dbenv, DB_APP_INIT)) { + if (dbenv == NULL || !F_ISSET(dbenv, DB_ENV_APPINIT)) { if (dir == NULL) goto tmp; a = dir; @@ -385,7 +390,7 @@ retry: switch (appname) { } tmp_create = 1; - if (dbenv == NULL || !F_ISSET(dbenv, DB_APP_INIT)) + if (dbenv == NULL || !F_ISSET(dbenv, DB_ENV_APPINIT)) goto tmp; else { a = dbenv->db_home; @@ -396,7 +401,7 @@ retry: switch (appname) { /* Reference a file from the appropriate temporary directory. */ if (0) { -tmp: if (dbenv == NULL || !F_ISSET(dbenv, DB_APP_INIT)) { +tmp: if (dbenv == NULL || !F_ISSET(dbenv, DB_ENV_APPINIT)) { memset(&etmp, 0, sizeof(etmp)); if ((ret = __db_tmp_dir(&etmp, DB_USE_ENVIRON)) != 0) return (ret); @@ -412,7 +417,7 @@ done: len = (c == NULL ? 0 : strlen(c) + 1) + (file == NULL ? 0 : strlen(file) + 1); - if ((start = (char *)malloc(len)) == NULL) { + if ((start = (char *)__db_malloc(len)) == NULL) { __db_err(dbenv, "%s", strerror(ENOMEM)); if (tmp_free) FREES(etmp.db_tmp_dir); @@ -484,7 +489,7 @@ __db_home(dbenv, db_home, flags) if (p == NULL) return (0); - if ((dbenv->db_home = (char *)strdup(p)) == NULL) { + if ((dbenv->db_home = (char *)__db_strdup(p)) == NULL) { __db_err(dbenv, "%s", strerror(ENOMEM)); return (ENOMEM); } @@ -509,7 +514,7 @@ __db_parse(dbenv, s) * We need to strdup the argument in case the caller passed us * static data. */ - if ((local_s = (char *)strdup(s)) == NULL) + if ((local_s = (char *)__db_strdup(s)) == NULL) return (ENOMEM); tp = local_s; @@ -526,14 +531,15 @@ illegal: ret = EINVAL; #define DATA_INIT_CNT 20 /* Start with 20 data slots. */ if (!strcmp(name, "DB_DATA_DIR")) { if (dbenv->db_data_dir == NULL) { - if ((dbenv->db_data_dir = (char **)calloc(DATA_INIT_CNT, + if ((dbenv->db_data_dir = + (char **)__db_calloc(DATA_INIT_CNT, sizeof(char **))) == NULL) goto nomem; dbenv->data_cnt = DATA_INIT_CNT; } else if (dbenv->data_next == dbenv->data_cnt - 1) { dbenv->data_cnt *= 2; if ((dbenv->db_data_dir = - (char **)realloc(dbenv->db_data_dir, + (char **)__db_realloc(dbenv->db_data_dir, dbenv->data_cnt * sizeof(char **))) == NULL) goto nomem; } @@ -549,7 +555,7 @@ illegal: ret = EINVAL; } else goto err; - if ((*p = (char *)strdup(value)) == NULL) { + if ((*p = (char *)__db_strdup(value)) == NULL) { nomem: ret = ENOMEM; __db_err(dbenv, "%s", strerror(ENOMEM)); } @@ -623,7 +629,7 @@ __db_tmp_dir(dbenv, flags) if (!Special2FSSpec(kTemporaryFolderType, kOnSystemDisk, 0, &spec)) { p = FSp2FullPath(&spec); - sTempFolder = malloc(strlen(p) + 1); + sTempFolder = __db_malloc(strlen(p) + 1); strcpy(sTempFolder, p); p = sTempFolder; } @@ -639,7 +645,7 @@ __db_tmp_dir(dbenv, flags) if (p == NULL) return (0); - if ((dbenv->db_tmp_dir = (char *)strdup(p)) == NULL) { + if ((dbenv->db_tmp_dir = (char *)__db_strdup(p)) == NULL) { __db_err(dbenv, "%s", strerror(ENOMEM)); return (ENOMEM); } @@ -722,7 +728,7 @@ __db_tmp_open(dbenv, dir, fdp) (void)sigprocmask(SIG_BLOCK, &set, &oset); #endif #define DB_TEMPOPEN DB_CREATE | DB_EXCL | DB_TEMPORARY - if ((ret = __db_fdopen(buf, + if ((ret = __db_open(buf, DB_TEMPOPEN, DB_TEMPOPEN, S_IRUSR | S_IWUSR, fdp)) == 0) { #ifdef HAVE_SIGFILLSET (void)sigprocmask(SIG_SETMASK, &oset, NULL); diff --git a/db2/common/db_apprec.c b/db2/common/db_apprec.c index 2e94673731..ac0176d70f 100644 --- a/db2/common/db_apprec.c +++ b/db2/common/db_apprec.c @@ -11,7 +11,7 @@ static const char copyright[] = "@(#) Copyright (c) 1997\n\ Sleepycat Software Inc. All rights reserved.\n"; -static const char sccsid[] = "@(#)db_apprec.c 10.16 (Sleepycat) 8/27/97"; +static const char sccsid[] = "@(#)db_apprec.c 10.18 (Sleepycat) 9/30/97"; #endif #ifndef NO_SYSTEM_INCLUDES @@ -31,12 +31,6 @@ static const char sccsid[] = "@(#)db_apprec.c 10.16 (Sleepycat) 8/27/97"; #include "txn.h" #include "common_ext.h" -#define FREE_DBT(L, D) { \ - if (F_ISSET((L), DB_AM_THREAD) && (D).data != NULL) \ - free((D).data); \ - (D).data = NULL; \ - } \ - /* * __db_apprec -- * Perform recovery. @@ -52,13 +46,22 @@ __db_apprec(dbenv, flags) DB_LOG *lp; DB_LSN ckp_lsn, first_lsn, lsn, tmp_lsn; time_t now; - int first_flag, ret; + int first_flag, is_thread, ret; void *txninfo; + lp = dbenv->lg_info; + /* Initialize the transaction list. */ if ((ret = __db_txnlist_init(&txninfo)) != 0) return (ret); + /* + * Save the state of the thread flag -- we don't need it on at the + * moment because we're single-threaded until recovery is complete. + */ + is_thread = F_ISSET(lp, DB_AM_THREAD); + F_CLR(lp, DB_AM_THREAD); + /* * Read forward through the log, opening the appropriate files so that * we can call recovery routines. In general, we start at the last @@ -66,20 +69,18 @@ __db_apprec(dbenv, flags) * recovery, we begin at the first LSN that appears in any log file * (log_get figures this out for us when we pass it the DB_FIRST flag). */ - lp = dbenv->lg_info; if (LF_ISSET(DB_RECOVER_FATAL)) first_flag = DB_FIRST; else { - if ((ret = __log_findckp(lp, &lsn)) == DB_NOTFOUND) + if ((ret = __log_findckp(lp, &lsn)) == DB_NOTFOUND) { + F_SET(lp, is_thread); return (0); + } first_flag = DB_SET; } /* If we're a threaded application, we have to allocate space. */ memset(&data, 0, sizeof(data)); - if (F_ISSET(lp, DB_AM_THREAD)) - F_SET(&data, DB_DBT_MALLOC); - if ((ret = log_get(lp, &lsn, &data, first_flag)) != 0) { __db_err(dbenv, "Failure: unable to get log record"); if (first_flag == DB_SET) @@ -93,7 +94,6 @@ __db_apprec(dbenv, flags) first_lsn = lsn; for (;;) { ret = __db_dispatch(lp, &data, &lsn, TXN_OPENFILES, txninfo); - FREE_DBT(lp, data); if (ret != 0 && ret != DB_TXN_CKP) goto msgerr; if ((ret = @@ -103,7 +103,6 @@ __db_apprec(dbenv, flags) break; } } - FREE_DBT(lp, data); /* * Initialize the ckp_lsn to 0,0. If we never find a valid @@ -116,7 +115,6 @@ __db_apprec(dbenv, flags) tmp_lsn = lsn; ret = __db_dispatch(lp, &data, &lsn, TXN_BACKWARD_ROLL, txninfo); - FREE_DBT(lp, data); if (ret == DB_TXN_CKP) { if (IS_ZERO_LSN(ckp_lsn)) ckp_lsn = tmp_lsn; @@ -124,20 +122,17 @@ __db_apprec(dbenv, flags) } else if (ret != 0) goto msgerr; } - FREE_DBT(lp, data); if (ret != 0 && ret != DB_NOTFOUND) goto err; for (ret = log_get(lp, &lsn, &data, DB_NEXT); ret == 0; ret = log_get(lp, &lsn, &data, DB_NEXT)) { ret = __db_dispatch(lp, &data, &lsn, TXN_FORWARD_ROLL, txninfo); - FREE_DBT(lp, data); if (ret == DB_TXN_CKP) ret = 0; else if (ret != 0) goto msgerr; } - FREE_DBT(lp, data); if (ret != DB_NOTFOUND) goto err; @@ -165,11 +160,12 @@ __db_apprec(dbenv, flags) (u_long)dbenv->tx_info->region->last_ckp.offset); } + F_SET(lp, is_thread); return (0); msgerr: __db_err(dbenv, "Recovery function for LSN %lu %lu failed", (u_long)lsn.file, (u_long)lsn.offset); -err: FREE_DBT(lp, data); +err: F_SET(lp, is_thread); return (ret); } diff --git a/db2/common/db_byteorder.c b/db2/common/db_byteorder.c index a8d7715455..e486132073 100644 --- a/db2/common/db_byteorder.c +++ b/db2/common/db_byteorder.c @@ -8,20 +8,20 @@ #include "config.h" #ifndef lint -static const char sccsid[] = "@(#)db_byteorder.c 10.3 (Sleepycat) 6/21/97"; +static const char sccsid[] = "@(#)db_byteorder.c 10.4 (Sleepycat) 9/4/97"; #endif /* not lint */ #ifndef NO_SYSTEM_INCLUDES #include -#include +#ifdef HAVE_ENDIAN_H +#include +#if BYTE_ORDER == BIG_ENDIAN +#define WORDS_BIGENDIAN 1 +#endif #endif -#ifdef HAVE_ENDIAN_H -# include -# if BYTE_ORDER == BIG_ENDIAN -# define WORDS_BIGENDIAN 1 -# endif +#include #endif #include "db_int.h" diff --git a/db2/common/db_region.c b/db2/common/db_region.c index 86d79a8148..3e8cd2dc66 100644 --- a/db2/common/db_region.c +++ b/db2/common/db_region.c @@ -43,7 +43,7 @@ #include "config.h" #ifndef lint -static const char sccsid[] = "@(#)db_region.c 10.13 (Sleepycat) 8/27/97"; +static const char sccsid[] = "@(#)db_region.c 10.15 (Sleepycat) 10/25/97"; #endif /* not lint */ #ifndef NO_SYSTEM_INCLUDES @@ -114,7 +114,7 @@ __db_rcreate(dbenv, appname, path, file, mode, size, fdp, retp) * attempts to create the region will return failure in one of the * attempts. */ - if (fd == -1 && (ret = __db_fdopen(name, + if (fd == -1 && (ret = __db_open(name, DB_CREATE | DB_EXCL, DB_CREATE | DB_EXCL, mode, &fd)) != 0) { if (ret != EEXIST) __db_err(dbenv, @@ -131,6 +131,42 @@ __db_rcreate(dbenv, appname, path, file, mode, size, fdp, retp) if ((ret = __db_rmap(dbenv, fd, size, &rp)) != 0) goto err; + /* Initialize the region. */ + if ((ret = __db_rinit(dbenv, rp, fd, size, 1)) != 0) + goto err; + + if (name != NULL) + FREES(name); + + *(void **)retp = rp; + return (0); + +err: if (fd != -1) { + if (rp != NULL) + (void)__db_unmap(rp, rp->size); + (void)__db_unlink(name); + (void)__db_close(fd); + } + if (name != NULL) + FREES(name); + return (ret); +} + +/* + * __db_rinit -- + * Initialize the region. + * + * PUBLIC: int __db_rinit __P((DB_ENV *, RLAYOUT *, int, size_t, int)); + */ +int +__db_rinit(dbenv, rp, fd, size, lock_region) + DB_ENV *dbenv; + RLAYOUT *rp; + size_t size; + int fd, lock_region; +{ + int ret; + /* * Initialize the common information. * @@ -141,9 +177,12 @@ __db_rcreate(dbenv, appname, path, file, mode, size, fdp, retp) * file permissions games, but we can't because WNT filesystems won't * open a file mode 0. * - * So, the process that's creating the region always acquires the lock - * before the setting the version number. Any process joining always - * checks the version number before attempting to acquire the lock. + * If the lock_region flag is set, the process creating the region + * acquires the lock before the setting the version number. Any + * process joining the region checks the version number before + * attempting to acquire the lock. (The lock_region flag may not be + * set -- the mpool code sometimes malloc's private regions but still + * needs to initialize them, specifically, the mutex for threads.) * * We have to check the version number first, because if the version * number has not been written, it's possible that the mutex has not @@ -151,30 +190,16 @@ __db_rcreate(dbenv, appname, path, file, mode, size, fdp, retp) * random behavior. If the version number isn't there (the file size * is too small) or it's 0, we know that the region is being created. */ - (void)__db_mutex_init(&rp->lock, MUTEX_LOCK_OFFSET(rp, &rp->lock)); - (void)__db_mutex_lock(&rp->lock, - fd, dbenv == NULL ? NULL : dbenv->db_yield); + __db_mutex_init(&rp->lock, MUTEX_LOCK_OFFSET(rp, &rp->lock)); + if (lock_region && (ret = __db_mutex_lock(&rp->lock, fd)) != 0) + return (ret); rp->refcnt = 1; rp->size = size; rp->flags = 0; db_version(&rp->majver, &rp->minver, &rp->patch); - if (name != NULL) - FREES(name); - - *(void **)retp = rp; return (0); - -err: if (fd != -1) { - if (rp != NULL) - (void)__db_munmap(rp, rp->size); - (void)__db_unlink(name); - (void)__db_close(fd); - } - if (name != NULL) - FREES(name); - return (ret); } /* @@ -205,7 +230,7 @@ __db_ropen(dbenv, appname, path, file, flags, fdp, retp) return (ret); /* Open the file. */ - if ((ret = __db_fdopen(name, flags, DB_MUTEXDEBUG, 0, &fd)) != 0) { + if ((ret = __db_open(name, flags, DB_MUTEXDEBUG, 0, &fd)) != 0) { __db_err(dbenv, "region open: %s: %s", name, strerror(ret)); goto err2; } @@ -225,8 +250,10 @@ __db_ropen(dbenv, appname, path, file, flags, fdp, retp) * flatly impossible. Hope that mmap fails if the file is too large. * */ - if ((ret = __db_stat(dbenv, name, fd, &size1, NULL)) != 0) + if ((ret = __db_ioinfo(name, fd, &size1, NULL)) != 0) { + __db_err(dbenv, "%s: %s", name, strerror(ret)); goto err2; + } /* Check to make sure the first block has been written. */ if ((size_t)size1 < sizeof(RLAYOUT)) { @@ -249,16 +276,17 @@ __db_ropen(dbenv, appname, path, file, flags, fdp, retp) /* Get the region lock. */ if (!LF_ISSET(DB_MUTEXDEBUG)) - (void)__db_mutex_lock(&rp->lock, - fd, dbenv == NULL ? NULL : dbenv->db_yield); + (void)__db_mutex_lock(&rp->lock, fd); /* * The file may have been half-written if we were descheduled between * getting the size of the file and checking the major version. Check * to make sure we got the entire file. */ - if ((ret = __db_stat(dbenv, name, fd, &size2, NULL)) != 0) + if ((ret = __db_ioinfo(name, fd, &size2, NULL)) != 0) { + __db_err(dbenv, "%s: %s", name, strerror(ret)); goto err1; + } if (size1 != size2) { ret = EAGAIN; goto err1; @@ -285,7 +313,7 @@ __db_ropen(dbenv, appname, path, file, flags, fdp, retp) err1: if (!LF_ISSET(DB_MUTEXDEBUG)) (void)__db_mutex_unlock(&rp->lock, fd); err2: if (rp != NULL) - (void)__db_munmap(rp, rp->size); + (void)__db_unmap(rp, rp->size); if (fd != -1) (void)__db_close(fd); FREES(name); @@ -312,8 +340,7 @@ __db_rclose(dbenv, fd, ptr) fail = NULL; /* Get the lock. */ - if ((ret = __db_mutex_lock(&rp->lock, - fd, dbenv == NULL ? NULL : dbenv->db_yield)) != 0) { + if ((ret = __db_mutex_lock(&rp->lock, fd)) != 0) { fail = "lock get"; goto err; } @@ -328,7 +355,7 @@ __db_rclose(dbenv, fd, ptr) } /* Discard the region. */ - if ((t_ret = __db_munmap(ptr, rp->size)) != 0 && fail == NULL) { + if ((t_ret = __db_unmap(ptr, rp->size)) != 0 && fail == NULL) { ret = t_ret; fail = "munmap"; } @@ -392,8 +419,7 @@ __db_runlink(dbenv, appname, path, file, force) /* Open and lock the region. */ if ((ret = __db_ropen(dbenv, appname, path, file, 0, &fd, &rp)) != 0) goto err1; - (void)__db_mutex_lock(&rp->lock, - fd, dbenv == NULL ? NULL : dbenv->db_yield); + (void)__db_mutex_lock(&rp->lock, fd); /* If the region is currently being deleted, fail. */ if (F_ISSET(rp, DB_R_DELETED)) { @@ -434,8 +460,7 @@ __db_runlink(dbenv, appname, path, file, force) /* Not a clue. Try to clear the DB_R_DELETED flag. */ if ((ret = __db_ropen(dbenv, appname, path, file, 0, &fd, &rp)) != 0) goto err1; - (void)__db_mutex_lock(&rp->lock, - fd, dbenv == NULL ? NULL : dbenv->db_yield); + (void)__db_mutex_lock(&rp->lock, fd); F_CLR(rp, DB_R_DELETED); /* FALLTHROUGH */ @@ -472,7 +497,7 @@ __db_rgrow(dbenv, fd, incr) char buf[__DB_VMPAGESIZE]; /* Seek to the end of the region. */ - if ((ret = __db_lseek(fd, 0, 0, 0, SEEK_END)) != 0) + if ((ret = __db_seek(fd, 0, 0, 0, SEEK_END)) != 0) goto err; /* Write nuls to the new bytes. */ @@ -500,7 +525,7 @@ __db_rgrow(dbenv, fd, incr) incr -= incr % __DB_VMPAGESIZE; /* Write the last page, not the page after the last. */ - if ((ret = __db_lseek(fd, 0, 0, incr - __DB_VMPAGESIZE, SEEK_CUR)) != 0) + if ((ret = __db_seek(fd, 0, 0, incr - __DB_VMPAGESIZE, SEEK_CUR)) != 0) goto err; if ((ret = __db_write(fd, buf, sizeof(buf), &nw)) != 0) goto err; @@ -531,7 +556,7 @@ __db_rremap(dbenv, ptr, oldsize, newsize, fd, retp) { int ret; - if ((ret = __db_munmap(ptr, oldsize)) != 0) { + if ((ret = __db_unmap(ptr, oldsize)) != 0) { __db_err(dbenv, "region remap: munmap: %s", strerror(ret)); return (ret); } @@ -553,7 +578,7 @@ __db_rmap(dbenv, fd, size, retp) RLAYOUT *rp; int ret; - if ((ret = __db_mmap(fd, size, 0, 0, &rp)) != 0) { + if ((ret = __db_map(fd, size, 0, 0, (void **)&rp)) != 0) { __db_err(dbenv, "region map: mmap %s", strerror(ret)); return (ret); } -- cgit 1.4.1