summaryrefslogtreecommitdiff
path: root/db2/common
diff options
context:
space:
mode:
Diffstat (limited to 'db2/common')
-rw-r--r--db2/common/db_appinit.c62
-rw-r--r--db2/common/db_apprec.c98
-rw-r--r--db2/common/db_byteorder.c7
-rw-r--r--db2/common/db_err.c8
-rw-r--r--db2/common/db_region.c4
5 files changed, 99 insertions, 80 deletions
diff --git a/db2/common/db_appinit.c b/db2/common/db_appinit.c
index 01891c66a7..51d9262859 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.27 (Sleepycat) 8/23/97";
+static const char sccsid[] = "@(#)db_appinit.c 10.33 (Sleepycat) 8/28/97";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -43,7 +43,7 @@ static int __db_tmp_open __P((DB_ENV *, char *, int *));
* db_version --
* Return verision information.
*/
-const char *
+char *
db_version(majverp, minverp, patchp)
int *majverp, *minverp, *patchp;
{
@@ -53,7 +53,7 @@ db_version(majverp, minverp, patchp)
*minverp = DB_VERSION_MINOR;
if (patchp != NULL)
*patchp = DB_VERSION_PATCH;
- return (DB_VERSION_STRING);
+ return ((char *)DB_VERSION_STRING);
}
/*
@@ -68,7 +68,7 @@ db_appinit(db_home, db_config, dbenv, flags)
int flags;
{
FILE *fp;
- int i_lock, i_log, i_mpool, i_txn, ret;
+ int ret;
char *lp, **p, buf[MAXPATHLEN * 2];
/* Validate arguments. */
@@ -94,7 +94,6 @@ db_appinit(db_home, db_config, dbenv, flags)
return (__db_ferr(dbenv, "db_appinit", 1));
fp = NULL;
- i_lock = i_log = i_mpool = i_txn = 0;
/* Set the database home. */
if ((ret = __db_home(dbenv, db_home, flags)) != 0)
@@ -117,6 +116,7 @@ db_appinit(db_home, db_config, dbenv, flags)
goto err;
}
(void)fclose(fp);
+ fp = NULL;
}
}
@@ -152,34 +152,22 @@ db_appinit(db_home, db_config, dbenv, flags)
#define DB_DEFPERM (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP)
/* Initialize the subsystems. */
- if (LF_ISSET(DB_INIT_LOCK)) {
- if ((ret = lock_open(NULL,
- LF_ISSET(DB_CREATE | DB_THREAD),
- DB_DEFPERM, dbenv, &dbenv->lk_info)) != 0)
- goto err;
- i_lock = 1;
- }
- if (LF_ISSET(DB_INIT_LOG)) {
- if ((ret = log_open(NULL,
- LF_ISSET(DB_CREATE | DB_THREAD),
- DB_DEFPERM, dbenv, &dbenv->lg_info)) != 0)
- goto err;
- i_log = 1;
- }
- if (LF_ISSET(DB_INIT_MPOOL)) {
- if ((ret = memp_open(NULL,
+ if (LF_ISSET(DB_INIT_LOCK) && (ret = lock_open(NULL,
+ LF_ISSET(DB_CREATE | DB_THREAD),
+ DB_DEFPERM, dbenv, &dbenv->lk_info)) != 0)
+ goto err;
+ if (LF_ISSET(DB_INIT_LOG) && (ret = log_open(NULL,
+ LF_ISSET(DB_CREATE | DB_THREAD),
+ DB_DEFPERM, dbenv, &dbenv->lg_info)) != 0)
+ goto err;
+ if (LF_ISSET(DB_INIT_MPOOL) && (ret = memp_open(NULL,
LF_ISSET(DB_CREATE | DB_MPOOL_PRIVATE | DB_NOMMAP | DB_THREAD),
- DB_DEFPERM, dbenv, &dbenv->mp_info)) != 0)
- goto err;
- i_mpool = 1;
- }
- if (LF_ISSET(DB_INIT_TXN)) {
- if ((ret = txn_open(NULL,
- LF_ISSET(DB_CREATE | DB_THREAD | DB_TXN_NOSYNC),
- DB_DEFPERM, dbenv, &dbenv->tx_info)) != 0)
- goto err;
- i_txn = 1;
- }
+ DB_DEFPERM, dbenv, &dbenv->mp_info)) != 0)
+ goto err;
+ if (LF_ISSET(DB_INIT_TXN) && (ret = txn_open(NULL,
+ LF_ISSET(DB_CREATE | DB_THREAD | DB_TXN_NOSYNC),
+ DB_DEFPERM, dbenv, &dbenv->tx_info)) != 0)
+ goto err;
/* Initialize recovery. */
if (LF_ISSET(DB_INIT_TXN)) {
@@ -195,7 +183,7 @@ db_appinit(db_home, db_config, dbenv, flags)
goto err;
}
- /* Now run recovery if necessary. */
+ /* Run recovery if necessary. */
if (LF_ISSET(DB_RECOVER | DB_RECOVER_FATAL) && (ret =
__db_apprec(dbenv, LF_ISSET(DB_RECOVER | DB_RECOVER_FATAL))) != 0)
goto err;
@@ -204,14 +192,6 @@ db_appinit(db_home, db_config, dbenv, flags)
err: if (fp != NULL)
(void)fclose(fp);
- if (i_lock)
- (void)lock_close(dbenv->lk_info);
- if (i_log)
- (void)log_close(dbenv->lg_info);
- if (i_mpool)
- (void)memp_close(dbenv->mp_info);
- if (i_txn)
- (void)txn_close(dbenv->tx_info);
(void)db_appexit(dbenv);
return (ret);
diff --git a/db2/common/db_apprec.c b/db2/common/db_apprec.c
index b22b0c5e9a..2e94673731 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.15 (Sleepycat) 7/27/97";
+static const char sccsid[] = "@(#)db_apprec.c 10.16 (Sleepycat) 8/27/97";
#endif
#ifndef NO_SYSTEM_INCLUDES
@@ -19,6 +19,7 @@ static const char sccsid[] = "@(#)db_apprec.c 10.15 (Sleepycat) 7/27/97";
#include <time.h>
#include <string.h>
+#include <stdlib.h>
#endif
#include "db_int.h"
@@ -30,6 +31,12 @@ static const char sccsid[] = "@(#)db_apprec.c 10.15 (Sleepycat) 7/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.
@@ -45,30 +52,34 @@ __db_apprec(dbenv, flags)
DB_LOG *lp;
DB_LSN ckp_lsn, first_lsn, lsn, tmp_lsn;
time_t now;
- int first_flag, ret, tret;
+ int first_flag, ret;
void *txninfo;
- ZERO_LSN(ckp_lsn);
-
/* Initialize the transaction list. */
if ((ret = __db_txnlist_init(&txninfo)) != 0)
return (ret);
/*
- * 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 figures this out for us when
- * we pass it the DB_FIRST flag).
+ * 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).
*/
lp = dbenv->lg_info;
if (LF_ISSET(DB_RECOVER_FATAL))
first_flag = DB_FIRST;
- else
- first_flag = __log_findckp(lp, &lsn) != 0 ? DB_FIRST : DB_SET;
+ else {
+ if ((ret = __log_findckp(lp, &lsn)) == DB_NOTFOUND)
+ 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)
@@ -80,35 +91,55 @@ __db_apprec(dbenv, flags)
}
first_lsn = lsn;
- for (; ret == 0;
- ret = log_get(dbenv->lg_info, &lsn, &data, DB_NEXT))
- if ((tret = __db_dispatch(lp,
- &data, &lsn, TXN_OPENFILES, txninfo)) < 0) {
- ret = tret;
+ 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 =
+ log_get(dbenv->lg_info, &lsn, &data, DB_NEXT)) != 0) {
+ if (ret != DB_NOTFOUND)
+ goto err;
+ break;
}
+ }
+ FREE_DBT(lp, data);
+ /*
+ * 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.
+ */
+ ZERO_LSN(ckp_lsn);
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;
- tret =
- __db_dispatch(lp, &data, &lsn, TXN_BACKWARD_ROLL, txninfo);
- if (IS_ZERO_LSN(ckp_lsn) && tret > 0)
- ckp_lsn = tmp_lsn;
- if (tret < 0) {
- ret = tret;
+ 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;
+ ret = 0;
+ } 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))
- if ((tret = __db_dispatch(lp,
- &data, &lsn, TXN_FORWARD_ROLL, txninfo)) < 0) {
- ret = tret;
+ 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;
/* Now close all the db files that are open. */
__log_close_files(lp);
@@ -118,11 +149,11 @@ __db_apprec(dbenv, flags)
* and the current time. Then take a checkpoint.
*/
(void)time(&now);
-
dbenv->tx_info->region->last_txnid = ((__db_txnhead *)txninfo)->maxid;
dbenv->tx_info->region->last_ckp = ckp_lsn;
- dbenv->tx_info->region->time_ckp = (u_int32_t) now;
- txn_checkpoint(dbenv->tx_info, 0, 0);
+ dbenv->tx_info->region->time_ckp = (u_int32_t)now;
+ if ((ret = txn_checkpoint(dbenv->tx_info, 0, 0)) != 0)
+ goto err;
if (dbenv->db_verbose) {
__db_err(lp->dbenv, "Recovery complete at %s", ctime(&now));
@@ -139,5 +170,6 @@ __db_apprec(dbenv, flags)
msgerr: __db_err(dbenv, "Recovery function for LSN %lu %lu failed",
(u_long)lsn.file, (u_long)lsn.offset);
-err: return (ret);
+err: FREE_DBT(lp, data);
+ return (ret);
}
diff --git a/db2/common/db_byteorder.c b/db2/common/db_byteorder.c
index d49883e093..a8d7715455 100644
--- a/db2/common/db_byteorder.c
+++ b/db2/common/db_byteorder.c
@@ -17,6 +17,13 @@ static const char sccsid[] = "@(#)db_byteorder.c 10.3 (Sleepycat) 6/21/97";
#include <errno.h>
#endif
+#ifdef HAVE_ENDIAN_H
+# include <endian.h>
+# if BYTE_ORDER == BIG_ENDIAN
+# define WORDS_BIGENDIAN 1
+# endif
+#endif
+
#include "db_int.h"
#include "common_ext.h"
diff --git a/db2/common/db_err.c b/db2/common/db_err.c
index 3dc4ca007d..f3e7b40448 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.16 (Sleepycat) 8/24/97";
+static const char sccsid[] = "@(#)db_err.c 10.18 (Sleepycat) 8/27/97";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -221,7 +221,7 @@ __db_panic(dbp)
* __db_fchk --
* General flags checking routine.
*
- * PUBLIC: int __db_fchk __P((DB_ENV *, char *, int, int));
+ * PUBLIC: int __db_fchk __P((DB_ENV *, const char *, int, int));
*/
int
__db_fchk(dbenv, name, flags, ok_flags)
@@ -237,7 +237,7 @@ __db_fchk(dbenv, name, flags, ok_flags)
* __db_fcchk --
* General combination flags checking routine.
*
- * PUBLIC: int __db_fcchk __P((DB_ENV *, char *, int, int, int));
+ * PUBLIC: int __db_fcchk __P((DB_ENV *, const char *, int, int, int));
*/
int
__db_fcchk(dbenv, name, flags, flag1, flag2)
@@ -521,7 +521,7 @@ __db_syncchk(dbp, flags)
* __db_ferr --
* Common flag errors.
*
- * PUBLIC: int __db_ferr __P((const DB_ENV *, char *, int));
+ * PUBLIC: int __db_ferr __P((const DB_ENV *, const char *, int));
*/
int
__db_ferr(dbenv, name, combo)
diff --git a/db2/common/db_region.c b/db2/common/db_region.c
index 51f8f4465c..86d79a8148 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.12 (Sleepycat) 7/26/97";
+static const char sccsid[] = "@(#)db_region.c 10.13 (Sleepycat) 8/27/97";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -229,7 +229,7 @@ __db_ropen(dbenv, appname, path, file, flags, fdp, retp)
goto err2;
/* Check to make sure the first block has been written. */
- if ((size_t) size1 < sizeof(RLAYOUT)) {
+ if ((size_t)size1 < sizeof(RLAYOUT)) {
ret = EAGAIN;
goto err2;
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-17 21:48:48 +0000