about summary refs log tree commit diff
path: root/db2/log
diff options
context:
space:
mode:
Diffstat (limited to 'db2/log')
-rw-r--r--db2/log/log.c56
-rw-r--r--db2/log/log_archive.c38
-rw-r--r--db2/log/log_auto.c16
-rw-r--r--db2/log/log_findckp.c12
-rw-r--r--db2/log/log_get.c27
-rw-r--r--db2/log/log_put.c210
-rw-r--r--db2/log/log_rec.c12
-rw-r--r--db2/log/log_register.c12
8 files changed, 224 insertions, 159 deletions
diff --git a/db2/log/log.c b/db2/log/log.c
index 893c1ee402..17681f8e0f 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.27 (Sleepycat) 9/23/97";
+static const char sccsid[] = "@(#)log.c	10.33 (Sleepycat) 11/2/97";
 #endif /* not lint */
 
 #ifndef NO_SYSTEM_INCLUDES
@@ -67,11 +67,11 @@ log_open(path, flags, mode, dbenv, lpp)
 	}
 
 	/* Create and initialize the DB_LOG structure. */
-	if ((dblp = (DB_LOG *)calloc(1, sizeof(DB_LOG))) == NULL)
+	if ((dblp = (DB_LOG *)__db_calloc(1, sizeof(DB_LOG))) == NULL)
 		return (ENOMEM);
 
-	if (path != NULL && (dblp->dir = strdup(path)) == NULL) {
-		free(dblp);
+	if (path != NULL && (dblp->dir = __db_strdup(path)) == NULL) {
+		__db_free(dblp);
 		return (ENOMEM);
 	}
 
@@ -329,10 +329,12 @@ __log_find(dblp, valp)
 	}
 
 	/* Get the list of file names. */
-	ret = __db_dir(dblp->dbenv, dir, &names, &fcnt);
+	ret = __db_dirlist(dir, &names, &fcnt);
 	FREES(p);
-	if (ret != 0)
+	if (ret != 0) {
+		__db_err(dblp->dbenv, "%s: %s", dir, strerror(ret));
 		return (ret);
+	}
 
 	/*
 	 * Search for a valid log file name, return a value of 0 on
@@ -350,7 +352,7 @@ __log_find(dblp, valp)
 		}
 
 	/* Discard the list. */
-	__db_dirf(dblp->dbenv, names, fcnt);
+	__db_dirfree(names, fcnt);
 
 	return (ret);
 }
@@ -376,10 +378,10 @@ __log_valid(dblp, lp, cnt)
 		return (ret);
 
 	fd = -1;
-	if ((ret = __db_fdopen(p,
+	if ((ret = __db_open(p,
 	    DB_RDONLY | DB_SEQUENTIAL,
 	    DB_RDONLY | DB_SEQUENTIAL, 0, &fd)) != 0 ||
-	    (ret = __db_lseek(fd, 0, 0, sizeof(HDR), SEEK_SET)) != 0 ||
+	    (ret = __db_seek(fd, 0, 0, sizeof(HDR), SEEK_SET)) != 0 ||
 	    (ret = __db_read(fd, &persist, sizeof(LOGP), &nw)) != 0 ||
 	    nw != sizeof(LOGP)) {
 		if (ret == 0)
@@ -474,3 +476,39 @@ log_unlink(path, force, dbenv)
 	return (__db_runlink(dbenv,
 	    DB_APP_LOG, path, DB_DEFAULT_LOG_FILE, force));
 }
+
+/*
+ * log_stat --
+ *	Return LOG statistics.
+ */
+int
+log_stat(dblp, gspp, db_malloc)
+	DB_LOG *dblp;
+	DB_LOG_STAT **gspp;
+	void *(*db_malloc) __P((size_t));
+{
+	LOG *lp;
+
+	*gspp = NULL;
+	lp = dblp->lp;
+
+	if ((*gspp = db_malloc == NULL ?
+	    (DB_LOG_STAT *)__db_malloc(sizeof(**gspp)) :
+	    (DB_LOG_STAT *)db_malloc(sizeof(**gspp))) == NULL)
+		return (ENOMEM);
+
+	/* Copy out the global statistics. */
+	LOCK_LOGREGION(dblp);
+	**gspp = lp->stat;
+
+	(*gspp)->st_magic = lp->persist.magic;
+	(*gspp)->st_version = lp->persist.version;
+	(*gspp)->st_mode = lp->persist.mode;
+	(*gspp)->st_lg_max = lp->persist.lg_max;
+
+	(*gspp)->st_region_nowait = lp->rlayout.lock.mutex_set_nowait;
+	(*gspp)->st_region_wait = lp->rlayout.lock.mutex_set_wait;
+	UNLOCK_LOGREGION(dblp);
+
+	return (0);
+}
diff --git a/db2/log/log_archive.c b/db2/log/log_archive.c
index 6904a2c726..140ea31fd1 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.26 (Sleepycat) 9/23/97";
+static const char sccsid[] = "@(#)log_archive.c	10.28 (Sleepycat) 10/28/97";
 #endif /* not lint */
 
 #ifndef NO_SYSTEM_INCLUDES
@@ -68,7 +68,7 @@ log_archive(dblp, listp, flags, db_malloc)
 	 * but that's just not possible.
 	 */
 	if (LF_ISSET(DB_ARCH_ABS)) {
-		__set_errno (0);
+		errno = 0;
 		if ((pref = getcwd(buf, sizeof(buf))) == NULL)
 			return (errno == 0 ? ENOMEM : errno);
 	} else
@@ -84,7 +84,7 @@ log_archive(dblp, listp, flags, db_malloc)
 		if ((ret = log_get(dblp, &stable_lsn, &rec, DB_LAST)) != 0)
 			return (ret);
 		if (F_ISSET(dblp, DB_AM_THREAD))
-			free(rec.data);
+			__db_free(rec.data);
 		fnum = stable_lsn.file;
 		break;
 	case 0:
@@ -102,7 +102,7 @@ log_archive(dblp, listp, flags, db_malloc)
 #define	LIST_INCREMENT	64
 	/* Get some initial space. */
 	if ((array =
-	    (char **)malloc(sizeof(char *) * (array_size = 10))) == NULL)
+	    (char **)__db_malloc(sizeof(char *) * (array_size = 10))) == NULL)
 		return (ENOMEM);
 	array[0] = NULL;
 
@@ -115,7 +115,7 @@ log_archive(dblp, listp, flags, db_malloc)
 
 		if (n >= array_size - 1) {
 			array_size += LIST_INCREMENT;
-			if ((array = (char **)realloc(array,
+			if ((array = (char **)__db_realloc(array,
 			    sizeof(char *) * array_size)) == NULL) {
 				ret = ENOMEM;
 				goto err;
@@ -127,7 +127,7 @@ log_archive(dblp, listp, flags, db_malloc)
 				goto err;
 			FREES(name);
 		} else if ((p = __db_rpath(name)) != NULL) {
-			if ((array[n] = (char *)strdup(p + 1)) == NULL) {
+			if ((array[n] = (char *)__db_strdup(p + 1)) == NULL) {
 				ret = ENOMEM;
 				goto err;
 			}
@@ -158,7 +158,7 @@ log_archive(dblp, listp, flags, db_malloc)
 err:	if (array != NULL) {
 		for (arrayp = array; *arrayp != NULL; ++arrayp)
 			FREES(*arrayp);
-		free(array);
+		__db_free(array);
 	}
 	return (ret);
 }
@@ -182,7 +182,7 @@ __build_data(dblp, pref, listp, db_malloc)
 
 	/* Get some initial space. */
 	if ((array =
-	    (char **)malloc(sizeof(char *) * (array_size = 10))) == NULL)
+	    (char **)__db_malloc(sizeof(char *) * (array_size = 10))) == NULL)
 		return (ENOMEM);
 	array[0] = NULL;
 
@@ -200,7 +200,7 @@ __build_data(dblp, pref, listp, db_malloc)
 		memcpy(&rectype, rec.data, sizeof(rectype));
 		if (rectype != DB_log_register) {
 			if (F_ISSET(dblp, DB_AM_THREAD)) {
-				free(rec.data);
+				__db_free(rec.data);
 				rec.data = NULL;
 			}
 			continue;
@@ -214,25 +214,25 @@ __build_data(dblp, pref, listp, db_malloc)
 
 		if (n >= array_size - 1) {
 			array_size += LIST_INCREMENT;
-			if ((array = (char **)realloc(array,
+			if ((array = (char **)__db_realloc(array,
 			    sizeof(char *) * array_size)) == NULL) {
 				ret = ENOMEM;
 				goto lg_free;
 			}
 		}
 
-		if ((array[n] = (char *)strdup(argp->name.data)) == NULL) {
+		if ((array[n] = (char *)__db_strdup(argp->name.data)) == NULL) {
 			ret = ENOMEM;
 lg_free:		if (F_ISSET(&rec, DB_DBT_MALLOC) && rec.data != NULL)
-				free(rec.data);
+				__db_free(rec.data);
 			goto err1;
 		}
 
 		array[++n] = NULL;
-		free(argp);
+		__db_free(argp);
 
 		if (F_ISSET(dblp, DB_AM_THREAD)) {
-			free(rec.data);
+			__db_free(rec.data);
 			rec.data = NULL;
 		}
 	}
@@ -289,7 +289,7 @@ lg_free:		if (F_ISSET(&rec, DB_DBT_MALLOC) && rec.data != NULL)
 			if (ret != 0)
 				goto err2;
 		} else if ((p = __db_rpath(real_name)) != NULL) {
-			array[last] = (char *)strdup(p + 1);
+			array[last] = (char *)__db_strdup(p + 1);
 			FREES(real_name);
 			if (array[last] == NULL)
 				goto err2;
@@ -321,7 +321,7 @@ err2:	/*
 err1:	if (array != NULL) {
 		for (arrayp = array; *arrayp != NULL; ++arrayp)
 			FREES(*arrayp);
-		free(array);
+		__db_free(array);
 	}
 	return (ret);
 }
@@ -341,7 +341,7 @@ __absname(pref, name, newnamep)
 	l_name = strlen(name);
 
 	/* Malloc space for concatenating the two. */
-	if ((newname = (char *)malloc(l_pref + l_name + 2)) == NULL)
+	if ((newname = (char *)__db_malloc(l_pref + l_name + 2)) == NULL)
 		return (ENOMEM);
 
 	/* Build the name. */
@@ -379,7 +379,7 @@ __usermem(listp, func)
 	 * Don't simplify this expression, SunOS compilers don't like it.
 	 */
 	if (func == NULL)
-		array = (char **)malloc(len);
+		array = (char **)__db_malloc(len);
 	else
 		array = (char **)func(len);
 	if (array == NULL)
@@ -399,7 +399,7 @@ __usermem(listp, func)
 	/* NULL-terminate the list. */
 	*arrayp = NULL;
 
-	free(*listp);
+	__db_free(*listp);
 	*listp = array;
 
 	return (0);
diff --git a/db2/log/log_auto.c b/db2/log/log_auto.c
index ea88a7bff9..d5dbfe1f5f 100644
--- a/db2/log/log_auto.c
+++ b/db2/log/log_auto.c
@@ -53,7 +53,7 @@ int __log_register_log(logp, txnid, ret_lsnp, flags,
 	    + sizeof(u_int32_t) + (uid == NULL ? 0 : uid->size)
 	    + sizeof(id)
 	    + sizeof(ftype);
-	if ((logrec.data = (void *)malloc(logrec.size)) == NULL)
+	if ((logrec.data = (void *)__db_malloc(logrec.size)) == NULL)
 		return (ENOMEM);
 
 	bp = logrec.data;
@@ -94,7 +94,7 @@ int __log_register_log(logp, txnid, ret_lsnp, flags,
 	ret = __log_put(logp, ret_lsnp, (DBT *)&logrec, flags);
 	if (txnid != NULL)
 		txnid->last_lsn = *ret_lsnp;
-	free(logrec.data);
+	__db_free(logrec.data);
 	return (ret);
 }
 
@@ -151,7 +151,7 @@ __log_register_print(notused1, dbtp, lsnp, notused3, notused4)
 	printf("\tid: %lu\n", (u_long)argp->id);
 	printf("\tftype: 0x%lx\n", (u_long)argp->ftype);
 	printf("\n");
-	free(argp);
+	__db_free(argp);
 	return (0);
 }
 
@@ -166,7 +166,7 @@ __log_register_read(recbuf, argpp)
 	__log_register_args *argp;
 	u_int8_t *bp;
 
-	argp = (__log_register_args *)malloc(sizeof(__log_register_args) +
+	argp = (__log_register_args *)__db_malloc(sizeof(__log_register_args) +
 	    sizeof(DB_TXN));
 	if (argp == NULL)
 		return (ENOMEM);
@@ -223,7 +223,7 @@ int __log_unregister_log(logp, txnid, ret_lsnp, flags,
 		lsnp = &txnid->last_lsn;
 	logrec.size = sizeof(rectype) + sizeof(txn_num) + sizeof(DB_LSN)
 	    + sizeof(id);
-	if ((logrec.data = (void *)malloc(logrec.size)) == NULL)
+	if ((logrec.data = (void *)__db_malloc(logrec.size)) == NULL)
 		return (ENOMEM);
 
 	bp = logrec.data;
@@ -242,7 +242,7 @@ int __log_unregister_log(logp, txnid, ret_lsnp, flags,
 	ret = __log_put(logp, ret_lsnp, (DBT *)&logrec, flags);
 	if (txnid != NULL)
 		txnid->last_lsn = *ret_lsnp;
-	free(logrec.data);
+	__db_free(logrec.data);
 	return (ret);
 }
 
@@ -280,7 +280,7 @@ __log_unregister_print(notused1, dbtp, lsnp, notused3, notused4)
 	    (u_long)argp->prev_lsn.offset);
 	printf("\tid: %lu\n", (u_long)argp->id);
 	printf("\n");
-	free(argp);
+	__db_free(argp);
 	return (0);
 }
 
@@ -295,7 +295,7 @@ __log_unregister_read(recbuf, argpp)
 	__log_unregister_args *argp;
 	u_int8_t *bp;
 
-	argp = (__log_unregister_args *)malloc(sizeof(__log_unregister_args) +
+	argp = (__log_unregister_args *)__db_malloc(sizeof(__log_unregister_args) +
 	    sizeof(DB_TXN));
 	if (argp == NULL)
 		return (ENOMEM);
diff --git a/db2/log/log_findckp.c b/db2/log/log_findckp.c
index df75e20e03..115a00e8aa 100644
--- a/db2/log/log_findckp.c
+++ b/db2/log/log_findckp.c
@@ -8,7 +8,7 @@
 #include "config.h"
 
 #ifndef lint
-static const char sccsid[] = "@(#)log_findckp.c	10.11 (Sleepycat) 8/27/97";
+static const char sccsid[] = "@(#)log_findckp.c	10.12 (Sleepycat) 10/25/97";
 #endif /* not lint */
 
 #ifndef NO_SYSTEM_INCLUDES
@@ -77,13 +77,13 @@ __log_findckp(lp, lsnp)
 	next_lsn = last_ckp;
 	do {
 		if (F_ISSET(lp, DB_AM_THREAD))
-			free(data.data);
+			__db_free(data.data);
 
 		if ((ret = log_get(lp, &next_lsn, &data, DB_SET)) != 0)
 			return (ret);
 		if ((ret = __txn_ckp_read(data.data, &ckp_args)) != 0) {
 			if (F_ISSET(lp, DB_AM_THREAD))
-				free(data.data);
+				__db_free(data.data);
 			return (ret);
 		}
 		if (IS_ZERO_LSN(ckp_lsn))
@@ -100,12 +100,12 @@ __log_findckp(lp, lsnp)
 		}
 		last_ckp = next_lsn;
 		next_lsn = ckp_args->last_ckp;
-		free(ckp_args);
+		__db_free(ckp_args);
 	} while (!IS_ZERO_LSN(next_lsn) &&
 	    log_compare(&last_ckp, &ckp_lsn) > 0);
 
 	if (F_ISSET(lp, DB_AM_THREAD))
-		free(data.data);
+		__db_free(data.data);
 
 	/*
 	 * At this point, either, next_lsn is ZERO or ckp_lsn is the
@@ -118,7 +118,7 @@ __log_findckp(lp, lsnp)
 		if ((ret = log_get(lp, &last_ckp, &data, DB_FIRST)) != 0)
 			return (ret);
 		if (F_ISSET(lp, DB_AM_THREAD))
-			free(data.data);
+			__db_free(data.data);
 	}
 	*lsnp = last_ckp;
 
diff --git a/db2/log/log_get.c b/db2/log/log_get.c
index 3f6df6c33c..ed35d57f82 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.19 (Sleepycat) 9/23/97";
+static const char sccsid[] = "@(#)log_get.c	10.21 (Sleepycat) 10/25/97";
 #endif /* not lint */
 
 #ifndef NO_SYSTEM_INCLUDES
@@ -170,7 +170,8 @@ __log_get(dblp, alsn, dbt, flags, silent)
 		if (!IS_ZERO_LSN(nlsn)) {
 			/* If at start-of-file, move to the previous file. */
 			if (nlsn.offset == 0) {
-				if (nlsn.file == 1)
+				if (nlsn.file == 1 ||
+				    __log_valid(dblp, NULL, nlsn.file - 1) != 0)
 					return (DB_NOTFOUND);
 
 				--nlsn.file;
@@ -215,27 +216,21 @@ retry:
 		goto cksum;
 	}
 
-	/*
-	 * Move the file descriptor to the page that has the hdr.  We dealt
-	 * with moving to a previous log file in the flags switch code, but
-	 * we don't yet know if we'll need to move to a subsequent file.
-	 *
-	 * Acquire a file descriptor.
-	 */
+	/* Acquire a file descriptor. */
 	if (dblp->c_fd == -1) {
 		if ((ret = __log_name(dblp, nlsn.file, &np)) != 0)
 			goto err1;
-		if ((ret = __db_fdopen(np, DB_RDONLY | DB_SEQUENTIAL,
+		if ((ret = __db_open(np, DB_RDONLY | DB_SEQUENTIAL,
 		    DB_RDONLY | DB_SEQUENTIAL, 0, &dblp->c_fd)) != 0) {
 			fail = np;
 			goto err1;
 		}
-		free(np);
+		__db_free(np);
 		np = NULL;
 	}
 
 	/* Seek to the header offset and read the header. */
-	if ((ret = __db_lseek(dblp->c_fd, 0, 0, nlsn.offset, SEEK_SET)) != 0) {
+	if ((ret = __db_seek(dblp->c_fd, 0, 0, nlsn.offset, SEEK_SET)) != 0) {
 		fail = "seek";
 		goto err1;
 	}
@@ -289,7 +284,7 @@ retry:
 	}
 
 	/* Allocate temporary memory to hold the record. */
-	if ((tbuf = (char *)malloc(len)) == NULL) {
+	if ((tbuf = (char *)__db_malloc(len)) == NULL) {
 		ret = ENOMEM;
 		goto err1;
 	}
@@ -318,7 +313,7 @@ retry:
 	if ((ret = __db_retcopy(dbt, tbuf, len,
 	    &dblp->c_dbt.data, &dblp->c_dbt.ulen, NULL)) != 0)
 		goto err1;
-	free(tbuf);
+	__db_free(tbuf);
 	tbuf = NULL;
 
 cksum:	if (hdr.cksum != __ham_func4(dbt->data, dbt->size)) {
@@ -349,8 +344,8 @@ err1:	if (!silent)
 			__db_err(dblp->dbenv,
 			    "log_get: %s: %s", fail, strerror(ret));
 err2:	if (np != NULL)
-		free(np);
+		__db_free(np);
 	if (tbuf != NULL)
-		free(tbuf);
+		__db_free(tbuf);
 	return (ret);
 }
diff --git a/db2/log/log_put.c b/db2/log/log_put.c
index 225595f33e..92d9563301 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.14 (Sleepycat) 9/23/97";
+static const char sccsid[] = "@(#)log_put.c	10.20 (Sleepycat) 11/2/97";
 #endif /* not lint */
 
 #ifndef NO_SYSTEM_INCLUDES
@@ -29,9 +29,10 @@ static const char sccsid[] = "@(#)log_put.c	10.14 (Sleepycat) 9/23/97";
 #include "common_ext.h"
 
 static int __log_fill __P((DB_LOG *, void *, u_int32_t));
+static int __log_flush __P((DB_LOG *, const DB_LSN *));
 static int __log_newfd __P((DB_LOG *));
-static int __log_write __P((DB_LOG *, void *, u_int32_t));
 static int __log_putr __P((DB_LOG *, const DBT *, u_int32_t));
+static int __log_write __P((DB_LOG *, void *, u_int32_t));
 
 /*
  * log_put --
@@ -63,11 +64,8 @@ log_put(dblp, lsn, dbt, flags)
 	}
 
 	LOCK_LOGREGION(dblp);
-
 	ret = __log_put(dblp, lsn, dbt, flags);
-
 	UNLOCK_LOGREGION(dblp);
-
 	return (ret);
 }
 
@@ -102,14 +100,10 @@ __log_put(dblp, lsn, dbt, flags)
 			    "log_put: record larger than maximum file size");
 			return (EINVAL);
 		}
-		if (lp->b_off != 0) {
-			if ((ret = __log_write(dblp, lp->buf, lp->b_off)) != 0)
-				return (ret);
-			if ((ret = __db_fsync(dblp->lfd)) != 0)
-				return (ret);
-			lp->s_lsn.file = lp->lsn.file;
-			lp->s_lsn.offset = lp->lsn.offset - 1;
-		}
+
+		/* Flush the log. */
+		if ((ret = __log_flush(dblp, NULL)) != 0)
+			return (ret);
 
 		/*
 		 * Save the last known offset from the previous file, we'll
@@ -117,9 +111,15 @@ __log_put(dblp, lsn, dbt, flags)
 		 */
 		lastoff = lp->lsn.offset;
 
+		/* Point the current LSN to the new file. */
 		++lp->lsn.file;
 		lp->lsn.offset = 0;
+
+		/* Reset the file write offset. */
 		lp->w_off = 0;
+
+		/* Reset the first-unwritten LSN for the buffer. */
+		lp->uw_lsn = lp->lsn;
 	} else
 		lastoff = 0;
 
@@ -149,56 +149,54 @@ __log_put(dblp, lsn, dbt, flags)
 	 *	Put out the checkpoint record (above).
 	 *	Save the LSN of the checkpoint in the shared region.
 	 *	Append the set of file name information into the log.
-	 *	Flush the current buffer contents to disk.
-	 *	Sync the log to disk.
-	 *	Save the time the checkpoint was written.
-	 *	Reset the bytes written since the last checkpoint.
 	 */
 	if (flags == DB_CHECKPOINT) {
 		lp->c_lsn = *lsn;
 
 		for (fnp = SH_TAILQ_FIRST(&dblp->lp->fq, __fname);
 		    fnp != NULL; fnp = SH_TAILQ_NEXT(fnp, q, __fname)) {
-			t.data = ADDR(dblp, fnp->name_off);
+			t.data = R_ADDR(dblp, fnp->name_off);
 			t.size = strlen(t.data) + 1;
 			memset(&fid_dbt, 0, sizeof(fid_dbt));
-			fid_dbt.data = ADDR(dblp, fnp->fileid_off);
+			fid_dbt.data = R_ADDR(dblp, fnp->fileid_off);
 			fid_dbt.size = DB_FILE_ID_LEN;
 			if ((ret = __log_register_log(dblp, NULL, &r_unused,
 			    0, &t, &fid_dbt, fnp->id, fnp->s_type)) != 0)
 				return (ret);
 		}
-		if (lp->b_off != 0 &&
-		    (ret = __log_write(dblp, lp->buf, lp->b_off)) != 0)
-			return (ret);
-		(void)time(&lp->chkpt);
-		lp->written = 0;
-
-		if ((ret = __db_fsync(dblp->lfd)) != 0)
-			return (ret);
-		lp->s_lsn.file = lp->lsn.file;
-		lp->s_lsn.offset = lp->lsn.offset - 1;
 	}
 
-	/* We always flush on a checkpoint. */
-	if (flags == DB_FLUSH || flags == DB_CHECKPOINT) {
-		if (lp->b_off != 0 &&
-		    (ret = __log_write(dblp, lp->buf, lp->b_off)) != 0)
+	/*
+	 * On a checkpoint or when flush is requested, we:
+	 *	Flush the current buffer contents to disk.
+	 *	Sync the log to disk.
+	 */
+	if (flags == DB_FLUSH || flags == DB_CHECKPOINT)
+		if ((ret = __log_flush(dblp, NULL)) != 0)
 			return (ret);
 
-		if ((ret = __db_fsync(dblp->lfd)) != 0)
-			return (ret);
-		lp->s_lsn.file = lp->lsn.file;
-		lp->s_lsn.offset = lp->lsn.offset - 1;
+	/*
+	 * On a checkpoint, we:
+	 *	Save the time the checkpoint was written.
+	 *	Reset the bytes written since the last checkpoint.
+	 */
+	if (flags == DB_CHECKPOINT) {
+		(void)time(&lp->chkpt);
+		lp->stat.st_wc_bytes = lp->stat.st_wc_mbytes = 0;
 	}
 
 	/*
-	 * If we just did I/O, i.e., this LSN could have spanned the start of
-	 * the in-core buffer, we remember it so that we can flush correctly
-	 * during a sync.
+	 * When an application calls the log_flush routine, we need to figure
+	 * out if the current buffer needs to be flushed.  The problem is that
+	 * if a record spans buffers, it's possible for the record continued
+	 * in the current buffer to have begun in a previous buffer.  Each time
+	 * we write a buffer, we update the first-unwritten LSN to point to the
+	 * first LSN after that written buffer.  If we have a spanning record,
+	 * correct that value to be the LSN that started it all, here.
 	 */
 	if (lsn->offset < lp->w_off && lsn->offset + lp->len > lp->w_off)
-		lp->span_lsn = *lsn;
+		lp->uw_lsn = *lsn;
+
 	return (0);
 }
 
@@ -248,6 +246,24 @@ log_flush(dblp, lsn)
 	DB_LOG *dblp;
 	const DB_LSN *lsn;
 {
+	int ret;
+
+	LOCK_LOGREGION(dblp);
+	ret = __log_flush(dblp, lsn);
+	UNLOCK_LOGREGION(dblp);
+	return (ret);
+}
+
+/*
+ * __log_flush --
+ *	Write all records less than or equal to the specified LSN; internal
+ *	version.
+ */
+static int
+__log_flush(dblp, lsn)
+	DB_LOG *dblp;
+	const DB_LSN *lsn;
+{
 	DB_LSN t_lsn;
 	LOG *lp;
 	int ret;
@@ -255,60 +271,64 @@ log_flush(dblp, lsn)
 	ret = 0;
 	lp = dblp->lp;
 
-	LOCK_LOGREGION(dblp);
-
-	/* If no LSN specified, flush the entire log. */
+	/*
+	 * If no LSN specified, flush the entire log by setting the flush LSN
+	 * to the last LSN written in the log.  Otherwise, check that the LSN
+	 * isn't a non-existent record for the log.
+	 */
 	if (lsn == NULL) {
 		t_lsn.file = lp->lsn.file;
 		t_lsn.offset = lp->lsn.offset - lp->len;
 		lsn = &t_lsn;
-	}
-
-	/* If it's a non-existent record, it's an error. */
-	if (lsn->file > lp->lsn.file ||
-	    (lsn->file == lp->lsn.file && lsn->offset > lp->lsn.offset)) {
-		__db_err(dblp->dbenv, "log_flush: LSN past current end-of-log");
-		ret = EINVAL;
-		goto ret1;
-	}
-
-	/*
-	 * If it's from a previous file, we're done because we sync each
-	 * file when we move to a new one.
-	 */
-	if (lsn->file < lp->lsn.file)
-		goto ret1;
+	} else
+		if (lsn->file > lp->lsn.file ||
+		    (lsn->file == lp->lsn.file &&
+		    lsn->offset > lp->lsn.offset - lp->len)) {
+			__db_err(dblp->dbenv,
+			    "log_flush: LSN past current end-of-log");
+			return (EINVAL);
+		}
 
 	/*
-	 * If it's less than the last-sync'd offset, we've already sync'd
-	 * this LSN.
+	 * If the LSN is less than the last-sync'd LSN, we're done.  Note,
+	 * the last-sync LSN saved in s_lsn is the LSN of the first byte 
+	 * that has not yet been written to disk, so the test is <, not <=.
 	 */
-	if (lsn->offset <= lp->s_lsn.offset)
-		goto ret1;
+	if (lsn->file < lp->s_lsn.file ||
+	    (lsn->file == lp->s_lsn.file && lsn->offset < lp->s_lsn.offset))
+		return (0);
 
 	/*
 	 * We may need to write the current buffer.  We have to write the
-	 * current buffer if the sync LSN is greater than or equal to the
-	 * saved spanning-LSN.
+	 * current buffer if the flush LSN is greater than or equal to the
+	 * first-unwritten LSN (uw_lsn).  If we write the buffer, then we
+	 * update the first-unwritten LSN.
 	 */
-	if (lsn->file >= lp->span_lsn.file &&
-	    lsn->offset >= lp->span_lsn.offset)
+	if (lp->b_off != 0 &&
+	    lsn->file >= lp->uw_lsn.file && lsn->offset >= lp->uw_lsn.offset)
 		if ((ret = __log_write(dblp, lp->buf, lp->b_off)) != 0)
-			goto ret1;
+			return (ret);
 
-	/* Acquire a file descriptor if we don't have one. */
-	if (dblp->lfname != dblp->lp->lsn.file &&
-	    (ret = __log_newfd(dblp)) != 0)
-		goto ret1;
+	/*
+	 * It's possible that this thread may never have written to this log
+	 * file.  Acquire a file descriptor if we don't already have one.
+	 */
+	if (dblp->lfname != dblp->lp->lsn.file)
+		if ((ret = __log_newfd(dblp)) != 0)
+			return (ret);
 
+	/* Sync all writes to disk. */
 	if ((ret = __db_fsync(dblp->lfd)) != 0)
-		goto ret1;
+		return (ret);
+	++lp->stat.st_scount;
 
-	lp->s_lsn.file = lp->lsn.file;
-	lp->s_lsn.offset = lsn->offset;
+	/*
+	 * Set the last-synced LSN, the first LSN after the last record
+	 * that we know is on disk.
+	 */
+	lp->s_lsn = lp->uw_lsn;
 
-ret1:	UNLOCK_LOGREGION(dblp);
-	return (ret);
+	return (0);
 }
 
 /*
@@ -385,17 +405,32 @@ __log_write(dblp, addr, len)
 	 * Seek to the offset in the file (someone may have written it
 	 * since we last did).
 	 */
-	if ((ret = __db_lseek(dblp->lfd, 0, 0, lp->w_off, SEEK_SET)) != 0)
+	if ((ret = __db_seek(dblp->lfd, 0, 0, lp->w_off, SEEK_SET)) != 0)
 		return (ret);
 	if ((ret = __db_write(dblp->lfd, addr, len, &nw)) != 0)
 		return (ret);
 	if (nw != (int32_t)len)
 		return (EIO);
 
-	/* Update the seek offset and reset the buffer offset. */
+	/*
+	 * Reset the buffer offset, update the seek offset, and update the
+	 * first-unwritten LSN.
+	 */
 	lp->b_off = 0;
 	lp->w_off += len;
-	lp->written += len;
+	lp->uw_lsn.file = lp->lsn.file;
+	lp->uw_lsn.offset = lp->w_off;
+
+	/* Update written statistics. */
+	if ((lp->stat.st_w_bytes += len) >= MEGABYTE) {
+		lp->stat.st_w_bytes -= MEGABYTE;
+		++lp->stat.st_w_mbytes;
+	}
+	if ((lp->stat.st_wc_bytes += len) >= MEGABYTE) {
+		lp->stat.st_wc_bytes -= MEGABYTE;
+		++lp->stat.st_wc_mbytes;
+	}
+	++lp->stat.st_wcount;
 
 	return (0);
 }
@@ -415,11 +450,8 @@ log_file(dblp, lsn, namep, len)
 	char *p;
 
 	LOCK_LOGREGION(dblp);
-
 	ret = __log_name(dblp, lsn->file, &p);
-
 	UNLOCK_LOGREGION(dblp);
-
 	if (ret != 0)
 		return (ret);
 
@@ -429,7 +461,7 @@ log_file(dblp, lsn, namep, len)
 		return (ENOMEM);
 	}
 	(void)strcpy(namep, p);
-	free(p);
+	__db_free(p);
 
 	return (0);
 }
@@ -455,7 +487,7 @@ __log_newfd(dblp)
 	dblp->lfname = dblp->lp->lsn.file;
 	if ((ret = __log_name(dblp, dblp->lfname, &p)) != 0)
 		return (ret);
-	if ((ret = __db_fdopen(p,
+	if ((ret = __db_open(p,
 	    DB_CREATE | DB_SEQUENTIAL,
 	    DB_CREATE | DB_SEQUENTIAL,
 	    dblp->lp->persist.mode, &dblp->lfd)) != 0)
@@ -472,14 +504,14 @@ __log_newfd(dblp)
  * PUBLIC: int __log_name __P((DB_LOG *, int, char **));
  */
 int
-__log_name(dblp, fileno, namep)
+__log_name(dblp, filenumber, namep)
 	DB_LOG *dblp;
 	char **namep;
-	int fileno;
+	int filenumber;
 {
 	char name[sizeof(LFNAME) + 10];
 
-	(void)snprintf(name, sizeof(name), LFNAME, fileno);
+	(void)snprintf(name, sizeof(name), LFNAME, filenumber);
 	return (__db_appname(dblp->dbenv,
 	    DB_APP_LOG, dblp->dir, name, NULL, namep));
 }
diff --git a/db2/log/log_rec.c b/db2/log/log_rec.c
index f49a7f16ea..92b8203990 100644
--- a/db2/log/log_rec.c
+++ b/db2/log/log_rec.c
@@ -40,7 +40,7 @@
 #include "config.h"
 
 #ifndef lint
-static const char sccsid[] = "@(#)log_rec.c	10.13 (Sleepycat) 8/27/97";
+static const char sccsid[] = "@(#)log_rec.c	10.14 (Sleepycat) 10/25/97";
 #endif /* not lint */
 
 #ifndef NO_SYSTEM_INCLUDES
@@ -99,7 +99,7 @@ __log_register_recover(logp, dbtp, lsnp, redo, info)
 
 out:	F_CLR(logp, DB_AM_RECOVER);
 	if (argp != NULL)
-		free(argp);
+		__db_free(argp);
 	return (ret);
 }
 
@@ -150,7 +150,7 @@ __log_unregister_recover(logp, dbtp, lsnp, redo, info)
 
 out:	F_CLR(logp, DB_AM_RECOVER);
 	if (argp != NULL)
-		free(argp);
+		__db_free(argp);
 	return (ret);
 }
 
@@ -227,14 +227,14 @@ __log_add_logid(logp, dbp, ndx)
 	 */
 	if (logp->dbentry_cnt <= ndx) {
 		if (logp->dbentry_cnt == 0) {
-			logp->dbentry =
-			    (DB_ENTRY *)malloc(DB_GROW_SIZE * sizeof(DB_ENTRY));
+			logp->dbentry = (DB_ENTRY *)
+			    __db_malloc(DB_GROW_SIZE * sizeof(DB_ENTRY));
 			if (logp->dbentry == NULL) {
 				ret = ENOMEM;
 				goto err;
 			}
 		} else {
-			temp_entryp = (DB_ENTRY *)realloc(logp->dbentry,
+			temp_entryp = (DB_ENTRY *)__db_realloc(logp->dbentry,
 			    (DB_GROW_SIZE + logp->dbentry_cnt) *
 			    sizeof(DB_ENTRY));
 			if (temp_entryp == NULL) {
diff --git a/db2/log/log_register.c b/db2/log/log_register.c
index 859b1e5bcb..2dab361616 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.11 (Sleepycat) 9/15/97";
+static const char sccsid[] = "@(#)log_register.c	10.12 (Sleepycat) 9/29/97";
 #endif /* not lint */
 
 #ifndef NO_SYSTEM_INCLUDES
@@ -72,7 +72,7 @@ log_register(dblp, dbp, name, type, idp)
 		if (fid <= fnp->id)
 			fid = fnp->id + 1;
 		if (!memcmp(dbp->lock.fileid,
-		    ADDR(dblp, fnp->fileid_off), DB_FILE_ID_LEN)) {
+		    R_ADDR(dblp, fnp->fileid_off), DB_FILE_ID_LEN)) {
 			++fnp->ref;
 			fid = fnp->id;
 			if (!F_ISSET(dblp, DB_AM_RECOVER) &&
@@ -95,13 +95,13 @@ log_register(dblp, dbp, name, type, idp)
 	 * XXX Now that uids are fixed size, we can put them in the fnp
 	 * structure.
 	 */
-	fnp->fileid_off = OFFSET(dblp, fidp);
+	fnp->fileid_off = R_OFFSET(dblp, fidp);
 	memcpy(fidp, dbp->lock.fileid, DB_FILE_ID_LEN);
 
 	len = strlen(name) + 1;
 	if ((ret = __db_shalloc(dblp->addr, len, 0, &namep)) != 0)
 		goto err;
-	fnp->name_off = OFFSET(dblp, namep);
+	fnp->name_off = R_OFFSET(dblp, namep);
 	memcpy(namep, name, len);
 
 	SH_TAILQ_INSERT_HEAD(&dblp->lp->fq, fnp, q, __fname);
@@ -185,8 +185,8 @@ log_unregister(dblp, fid)
 	}
 
 	/* Free the unique file information, name and structure. */
-	__db_shalloc_free(dblp->addr, ADDR(dblp, fnp->fileid_off));
-	__db_shalloc_free(dblp->addr, ADDR(dblp, fnp->name_off));
+	__db_shalloc_free(dblp->addr, R_ADDR(dblp, fnp->fileid_off));
+	__db_shalloc_free(dblp->addr, R_ADDR(dblp, fnp->name_off));
 	SH_TAILQ_REMOVE(&dblp->lp->fq, fnp, q, __fname);
 	__db_shalloc_free(dblp->addr, fnp);
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-08-12 00:52:39 +0000