summary refs log tree commit diff
path: root/db2/common
diff options
context:
space:
mode:
Diffstat (limited to 'db2/common')
-rw-r--r--db2/common/db_appinit.c7
-rw-r--r--db2/common/db_apprec.c129
-rw-r--r--db2/common/db_err.c28
-rw-r--r--db2/common/db_region.c77
-rw-r--r--db2/common/db_shash.c10
5 files changed, 160 insertions, 91 deletions
diff --git a/db2/common/db_appinit.c b/db2/common/db_appinit.c
index 05fc7cc084..4ee9e4f40c 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.37 (Sleepycat) 11/25/97";
+static const char sccsid[] = "@(#)db_appinit.c	10.38 (Sleepycat) 1/7/98";
 #endif /* not lint */
 
 #ifndef NO_SYSTEM_INCLUDES
@@ -69,7 +69,8 @@ db_appinit(db_home, db_config, dbenv, flags)
 {
 	FILE *fp;
 	int ret;
-	char *lp, **p, buf[MAXPATHLEN * 2];
+	char * const *p;
+	char *lp, buf[MAXPATHLEN * 2];
 
 	/* Validate arguments. */
 	if (dbenv == NULL)
@@ -104,7 +105,7 @@ db_appinit(db_home, db_config, dbenv, flags)
 		goto err;
 
 	/* Parse the config array. */
-	for (p = (char **)db_config; p != NULL && *p != NULL; ++p)
+	for (p = db_config; p != NULL && *p != NULL; ++p)
 		if ((ret = __db_parse(dbenv, *p)) != 0)
 			goto err;
 
diff --git a/db2/common/db_apprec.c b/db2/common/db_apprec.c
index 188c6b9f95..7a42e13317 100644
--- a/db2/common/db_apprec.c
+++ b/db2/common/db_apprec.c
@@ -11,12 +11,13 @@
 static const char copyright[] =
 "@(#) Copyright (c) 1997\n\
 	Sleepycat Software Inc.  All rights reserved.\n";
-static const char sccsid[] = "@(#)db_apprec.c	10.19 (Sleepycat) 11/23/97";
+static const char sccsid[] = "@(#)db_apprec.c	10.23 (Sleepycat) 1/17/98";
 #endif
 
 #ifndef NO_SYSTEM_INCLUDES
 #include <sys/types.h>
 
+#include <errno.h>
 #include <time.h>
 #include <string.h>
 #include <stdlib.h>
@@ -44,9 +45,9 @@ __db_apprec(dbenv, flags)
 {
 	DBT data;
 	DB_LOG *lp;
-	DB_LSN ckp_lsn, first_lsn, lsn, tmp_lsn;
+	DB_LSN ckp_lsn, first_lsn, lsn;
 	time_t now;
-	int first_flag, is_thread, ret;
+	int is_thread, ret;
 	void *txninfo;
 
 	lp = dbenv->lg_info;
@@ -63,73 +64,109 @@ __db_apprec(dbenv, flags)
 	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
-	 * checkpoint prior to the last checkpointed LSN.  For catastrophic
-	 * 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).
+	 * Recovery is done in three passes:
+	 * Pass #1:
+	 *	Read forward through the log from the last checkpoint to the
+	 *	end of the log, opening and closing files so that at the end
+	 *	of the log we have the "current" set of files open.
+	 * Pass #2:
+	 *	Read backward through the log undoing any uncompleted TXNs.
+	 *	If doing catastrophic recovery, we read to the beginning of
+	 *	the log, otherwise, to the most recent checkpoint that occurs
+	 *	before the most recent checkpoint LSN, which is returned by
+	 *	__log_findckp().  During this pass, checkpoint file information
+	 *	is ignored, and file openings and closings are undone.
+	 * Pass #3:
+	 *	Read forward through the log from the LSN found in pass #2,
+	 *	redoing any committed TXNs.  During this pass, checkpoint
+	 *	file information is ignored, and file openings and closings
+	 *	are redone.
 	 */
-	if (LF_ISSET(DB_RECOVER_FATAL))
-		first_flag = DB_FIRST;
-	else {
-		if ((ret = __log_findckp(lp, &lsn)) == DB_NOTFOUND)
-			goto out;
-		first_flag = DB_SET;
-	}
 
-	/* If we're a threaded application, we have to allocate space. */
+	/*
+	 * Find the last checkpoint in the log.  This is the point from which
+	 * we want to begin pass #1 (the TXN_OPENFILES pass).
+	 */
 	memset(&data, 0, sizeof(data));
-	if ((ret = log_get(lp, &lsn, &data, first_flag)) != 0) {
-		__db_err(dbenv, "Failure: unable to get log record");
-		if (first_flag == DB_SET)
-			__db_err(dbenv, "Retrieving LSN %lu %lu",
-			    (u_long)lsn.file, (u_long)lsn.offset);
-		else
-			__db_err(dbenv, "Retrieving first LSN");
-		goto out;
+	if ((ret = log_get(lp, &ckp_lsn, &data, DB_CHECKPOINT)) != 0) {
+		/*
+		 * If we don't find a checkpoint, start from the beginning.
+		 * If that fails, we're done.  Note, we require that there
+		 * be log records if we're performing recovery, and fail if
+		 * there aren't.
+		 */
+		if ((ret = log_get(lp, &ckp_lsn, &data, DB_FIRST)) != 0) {
+			__db_err(dbenv, "First log record not found");
+			if (ret == DB_NOTFOUND)
+				ret = EINVAL;
+			goto out;
+		}
 	}
 
-	first_lsn = lsn;
+	/*
+	 * Now, ckp_lsn is either the lsn of the last checkpoint or the lsn
+	 * of the first record in the log.  Begin the TXN_OPENFILES pass from
+	 * that lsn, and proceed to the end of the log.
+	 */
+	lsn = ckp_lsn;
 	for (;;) {
 		ret = __db_dispatch(lp, &data, &lsn, TXN_OPENFILES, txninfo);
 		if (ret != 0 && ret != DB_TXN_CKP)
 			goto msgerr;
-		if ((ret =
-		    log_get(dbenv->lg_info, &lsn, &data, DB_NEXT)) != 0) {
-			if (ret != DB_NOTFOUND)
-				goto out;
-			break;
+		if ((ret = log_get(lp, &lsn, &data, DB_NEXT)) != 0) {
+			if (ret == DB_NOTFOUND)
+				break;
+			goto out;
 		}
 	}
 
 	/*
-	 * Initialize the ckp_lsn to 0,0.  If we never find a valid
-	 * checkpoint in the log, then leaving ckp_lsn at 0,0 is correct.
+	 * Pass #2.
+	 *
+	 * Before we can begin pass #2, backward roll phase, we determine how
+	 * far back in the log to recover.  If we are doing catastrophic
+	 * recovery, then we go as far back as we have files.  If we are
+	 * doing normal recovery, we go as back to the most recent checkpoint
+	 * that occurs before the most recent checkpoint LSN.
 	 */
-	ZERO_LSN(ckp_lsn);
+	if (LF_ISSET(DB_RECOVER_FATAL)) {
+		ZERO_LSN(first_lsn);
+	} else
+		if ((ret = __log_findckp(lp, &first_lsn)) == DB_NOTFOUND) {
+			/*
+			 * If recovery was specified, there must be log files.
+			 * If we don't find one, it's an error.  (This should
+			 * have been caught above, when a log_get() of DB_FIRST
+			 * or DB_CHECKPOINT succeeded, but paranoia is good.)
+			 */
+			ret = EINVAL;
+			goto out;
+		}
 	for (ret = log_get(lp, &lsn, &data, DB_LAST);
 	    ret == 0 && log_compare(&lsn, &first_lsn) > 0;
-	    ret = log_get(lp,&lsn, &data, DB_PREV)) {
-		tmp_lsn = lsn;
+	    ret = log_get(lp, &lsn, &data, DB_PREV)) {
 		ret = __db_dispatch(lp,
 		    &data, &lsn, TXN_BACKWARD_ROLL, txninfo);
-		if (ret == DB_TXN_CKP) {
-			if (IS_ZERO_LSN(ckp_lsn))
-				ckp_lsn = tmp_lsn;
-			ret = 0;
-		} else if (ret != 0)
-			goto msgerr;
+		if (ret != 0)
+			if (ret != DB_TXN_CKP)
+				goto msgerr;
+			else
+				ret = 0;
 	}
 	if (ret != 0 && ret != DB_NOTFOUND)
 		goto out;
 
+	/*
+	 * Pass #3.
+	 */
 	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);
-		if (ret == DB_TXN_CKP)
-			ret = 0;
-		else if (ret != 0)
-			goto msgerr;
+		if (ret != 0)
+			if (ret != DB_TXN_CKP)
+				goto msgerr;
+			else
+				ret = 0;
 	}
 	if (ret != DB_NOTFOUND)
 		goto out;
@@ -149,7 +186,7 @@ __db_apprec(dbenv, flags)
 		goto out;
 
 	if (dbenv->db_verbose) {
-		__db_err(lp->dbenv, "Recovery complete at %s", ctime(&now));
+		__db_err(lp->dbenv, "Recovery complete at %.24s", ctime(&now));
 		__db_err(lp->dbenv, "%s %lu %s [%lu][%lu]",
 		    "Maximum transaction id",
 		    (u_long)dbenv->tx_info->region->last_txnid,
diff --git a/db2/common/db_err.c b/db2/common/db_err.c
index 13f2cb5dc3..fc59aadbaf 100644
--- a/db2/common/db_err.c
+++ b/db2/common/db_err.c
@@ -8,7 +8,7 @@
 #include "config.h"
 
 #ifndef lint
-static const char sccsid[] = "@(#)db_err.c	10.19 (Sleepycat) 11/9/97";
+static const char sccsid[] = "@(#)db_err.c	10.21 (Sleepycat) 1/13/98";
 #endif /* not lint */
 
 #ifndef NO_SYSTEM_INCLUDES
@@ -97,7 +97,9 @@ __db_ecursor(a, b, c)
 	DB_TXN *b;
 	DBC **c;
 {
-	a = a; b = b; c = c;			/* XXX: Shut the compiler up. */
+	COMPQUIET(a, NULL);
+	COMPQUIET(b, NULL);
+	COMPQUIET(c, NULL);
 
 	return (EPERM);
 }
@@ -113,7 +115,10 @@ __db_edel(a, b, c, d)
 	DBT *c;
 	int d;
 {
-	a = a; b = b; c = c; d = d;		/* XXX: Shut the compiler up. */
+	COMPQUIET(a, NULL);
+	COMPQUIET(b, NULL);
+	COMPQUIET(c, NULL);
+	COMPQUIET(d, 0);
 
 	return (EPERM);
 }
@@ -127,7 +132,8 @@ __db_efd(a, b)
 	DB *a;
 	int *b;
 {
-	a = a; b = b;				/* XXX: Shut the compiler up. */
+	COMPQUIET(a, NULL);
+	COMPQUIET(b, NULL);
 
 	return (EPERM);
 }
@@ -143,7 +149,11 @@ __db_egp(a, b, c, d, e)
 	DBT *c, *d;
 	int e;
 {
-	a = a; b = b; c = c; d = d; e = e;	/* XXX: Shut the compiler up. */
+	COMPQUIET(a, NULL);
+	COMPQUIET(b, NULL);
+	COMPQUIET(c, NULL);
+	COMPQUIET(d, NULL);
+	COMPQUIET(e, 0);
 
 	return (EPERM);
 }
@@ -159,7 +169,10 @@ __db_estat(a, b, c, d)
 	void *(*c) __P((size_t));
 	int d;
 {
-	a = a; b = b; c = c; d = d;		/* XXX: Shut the compiler up. */
+	COMPQUIET(a, NULL);
+	COMPQUIET(b, NULL);
+	COMPQUIET(c, NULL);
+	COMPQUIET(d, 0);
 
 	return (EPERM);
 }
@@ -173,7 +186,8 @@ __db_esync(a, b)
 	DB *a;
 	int b;
 {
-	a = a; b = b;				/* XXX: Shut the compiler up. */
+	COMPQUIET(a, NULL);
+	COMPQUIET(b, 0);
 
 	return (EPERM);
 }
diff --git a/db2/common/db_region.c b/db2/common/db_region.c
index 4fc603a2b0..02d939e3e6 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.18 (Sleepycat) 11/28/97";
+static const char sccsid[] = "@(#)db_region.c	10.21 (Sleepycat) 1/16/98";
 #endif /* not lint */
 
 #ifndef NO_SYSTEM_INCLUDES
@@ -168,6 +168,8 @@ __db_rinit(dbenv, rp, fd, size, lock_region)
 {
 	int ret;
 
+	COMPQUIET(dbenv, NULL);
+
 	/*
 	 * Initialize the common information.
 	 *
@@ -190,6 +192,12 @@ __db_rinit(dbenv, rp, fd, size, lock_region)
 	 * been initialized in which case an attempt to get it could lead to
 	 * 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.
+	 *
+	 * We also make sure to check the return of __db_mutex_lock() here,
+	 * even though we don't usually check elsewhere.  This is the first
+	 * lock we attempt to acquire, and if it fails we have to know.  (It
+	 * can fail -- SunOS, using fcntl(2) for locking, with an in-memory
+	 * filesystem specified as the database home.)
 	 */
 	__db_mutex_init(&rp->lock, MUTEX_LOCK_OFFSET(rp, &rp->lock));
 	if (lock_region && (ret = __db_mutex_lock(&rp->lock, fd)) != 0)
@@ -219,7 +227,8 @@ __db_ropen(dbenv, appname, path, file, flags, fdp, retp)
 	void *retp;
 {
 	RLAYOUT *rp;
-	off_t size1, size2;
+	size_t size;
+	u_int32_t mbytes, bytes;
 	int fd, ret;
 	char *name;
 
@@ -251,19 +260,20 @@ __db_ropen(dbenv, appname, path, file, flags, fdp, retp)
 	 * flatly impossible.  Hope that mmap fails if the file is too large.
 	 *
 	 */
-	if ((ret = __db_ioinfo(name, fd, &size1, NULL)) != 0) {
+	if ((ret = __db_ioinfo(name, fd, &mbytes, &bytes, NULL)) != 0) {
 		__db_err(dbenv, "%s: %s", name, strerror(ret));
 		goto err2;
 	}
+	size = mbytes * MEGABYTE + bytes;
 
 	/* Check to make sure the first block has been written. */
-	if ((size_t)size1 < sizeof(RLAYOUT)) {
+	if (size < sizeof(RLAYOUT)) {
 		ret = EAGAIN;
 		goto err2;
 	}
 
 	/* Map in whatever is there. */
-	if ((ret = __db_rmap(dbenv, fd, size1, &rp)) != 0)
+	if ((ret = __db_rmap(dbenv, fd, size, &rp)) != 0)
 		goto err2;
 
 	/*
@@ -284,11 +294,11 @@ __db_ropen(dbenv, appname, path, file, flags, fdp, retp)
 	 * getting the size of the file and checking the major version.  Check
 	 * to make sure we got the entire file.
 	 */
-	if ((ret = __db_ioinfo(name, fd, &size2, NULL)) != 0) {
+	if ((ret = __db_ioinfo(name, fd, &mbytes, &bytes, NULL)) != 0) {
 		__db_err(dbenv, "%s: %s", name, strerror(ret));
 		goto err1;
 	}
-	if (size1 != size2) {
+	if (size != mbytes * MEGABYTE + bytes) {
 		ret = EAGAIN;
 		goto err1;
 	}
@@ -490,11 +500,9 @@ __db_rgrow(dbenv, fd, incr)
 	int fd;
 	size_t incr;
 {
-#ifdef MMAP_INIT_NEEDED
 	size_t i;
-#endif
 	ssize_t nw;
-	int ret;
+	int mmap_init_needed, ret;
 	char buf[__DB_VMPAGESIZE];
 
 	/* Seek to the end of the region. */
@@ -506,33 +514,42 @@ __db_rgrow(dbenv, fd, incr)
 
 	/*
 	 * Historically, some systems required that all of the bytes of the
-	 * region be written before you could mmap it and access it randomly.
+	 * region be written before it could be mmapped and accessed randomly.
+	 *
+	 * Windows/95 doesn't have that problem, but it leaves file contents
+	 * uninitialized.  Win/NT apparently initializes them.
 	 */
 #ifdef MMAP_INIT_NEEDED
-	/* Extend the region by writing each new page. */
-	for (i = 0; i < incr; i += __DB_VMPAGESIZE) {
+	mmap_init_needed = 1;
+#else
+	mmap_init_needed = __os_oldwin();
+#endif
+	if (mmap_init_needed)
+		/* Extend the region by writing each new page. */
+		for (i = 0; i < incr; i += __DB_VMPAGESIZE) {
+			if ((ret = __db_write(fd, buf, sizeof(buf), &nw)) != 0)
+				goto err;
+			if (nw != sizeof(buf))
+				goto eio;
+		}
+	else {
+		/*
+		 * Extend the region by writing the last page.
+		 *
+		 * Round off the increment to the next page boundary.
+		 */
+		incr += __DB_VMPAGESIZE - 1;
+		incr -= incr % __DB_VMPAGESIZE;
+
+		/* Write the last page, not the page after the last. */
+		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;
 		if (nw != sizeof(buf))
 			goto eio;
 	}
-#else
-	/*
-	 * Extend the region by writing the last page.
-	 *
-	 * Round off the increment to the next page boundary.
-	 */
-	incr += __DB_VMPAGESIZE - 1;
-	incr -= incr % __DB_VMPAGESIZE;
-
-	/* Write the last page, not the page after the last. */
-	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;
-	if (nw != sizeof(buf))
-		goto eio;
-#endif
 	return (0);
 
 eio:	ret = EIO;
diff --git a/db2/common/db_shash.c b/db2/common/db_shash.c
index 988de8a994..ab188f564f 100644
--- a/db2/common/db_shash.c
+++ b/db2/common/db_shash.c
@@ -8,7 +8,7 @@
 #include "config.h"
 
 #ifndef lint
-static const char sccsid[] = "@(#)db_shash.c	10.3 (Sleepycat) 6/21/97";
+static const char sccsid[] = "@(#)db_shash.c	10.4 (Sleepycat) 1/8/98";
 #endif /* not lint */
 
 #ifndef NO_SYSTEM_INCLUDES
@@ -21,8 +21,8 @@ static const char sccsid[] = "@(#)db_shash.c	10.3 (Sleepycat) 6/21/97";
 
 /* Powers-of-2 and close-by prime number pairs. */
 static const struct {
-	int	power;
-	int	prime;
+	u_int	power;
+	u_int	prime;
 } list[] = {
 	{  64,	  67},
 	{ 128,	 131},
@@ -39,11 +39,11 @@ static const struct {
  * __db_tablesize --
  *	Choose a size for the hash table.
  *
- * PUBLIC: int __db_tablesize __P((int));
+ * PUBLIC: int __db_tablesize __P((u_int));
  */
 int
 __db_tablesize(n_buckets)
-	int n_buckets;
+	u_int n_buckets;
 {
 	int i;
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-23 18:03:13 +0000