summaryrefslogtreecommitdiff
path: root/db2/log
diff options
context:
space:
mode:
Diffstat (limited to 'db2/log')
-rw-r--r--db2/log/log.c104
-rw-r--r--db2/log/log_archive.c76
-rw-r--r--db2/log/log_auto.c4
-rw-r--r--db2/log/log_get.c9
-rw-r--r--db2/log/log_put.c23
-rw-r--r--db2/log/log_register.c11
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);
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-28 04:49:12 +0000