summaryrefslogtreecommitdiff
path: root/db/txn
diff options
context:
space:
mode:
Diffstat (limited to 'db/txn')
-rw-r--r--db/txn/txn.c14
-rw-r--r--db/txn/txn_recover.c6
-rw-r--r--db/txn/txn_region.c17
-rw-r--r--db/txn/txn_stat.c4
4 files changed, 19 insertions, 22 deletions
diff --git a/db/txn/txn.c b/db/txn/txn.c
index 94755318b..f0e4f7d4c 100644
--- a/db/txn/txn.c
+++ b/db/txn/txn.c
@@ -35,7 +35,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: txn.c,v 11.248 2004/09/23 15:02:32 bostic Exp $
+ * $Id: txn.c,v 11.249 2004/10/15 16:59:44 bostic Exp $
*/
#include "db_config.h"
@@ -389,7 +389,7 @@ __txn_begin_int(txn, internal)
td->flags = 0;
td->xa_status = 0;
- off = R_OFFSET(dbenv, &mgr->reginfo, td);
+ off = R_OFFSET(&mgr->reginfo, td);
R_UNLOCK(dbenv, &mgr->reginfo);
ZERO_LSN(txn->last_lsn);
@@ -928,7 +928,7 @@ __txn_isvalid(txnp, tdp, op)
}
/* Check transaction's state. */
- tp = (TXN_DETAIL *)R_ADDR(dbenv, &mgrp->reginfo, txnp->off);
+ tp = R_ADDR(&mgrp->reginfo, txnp->off);
if (tdp != NULL)
*tdp = tp;
@@ -1055,7 +1055,7 @@ __txn_end(txnp, is_commit)
/* End the transaction. */
R_LOCK(dbenv, &mgr->reginfo);
- tp = (TXN_DETAIL *)R_ADDR(dbenv, &mgr->reginfo, txnp->off);
+ tp = R_ADDR(&mgr->reginfo, txnp->off);
SH_TAILQ_REMOVE(&region->active_txn, tp, links, __txn_detail);
if (F_ISSET(tp, TXN_DTL_RESTORED)) {
region->stat.st_nrestores--;
@@ -1674,11 +1674,9 @@ __txn_set_begin_lsnp(txn, rlsnp)
DB_LSN *lsnp;
TXN_DETAIL *td;
- td = (TXN_DETAIL *)R_ADDR(txn->mgrp->dbenv,
- &txn->mgrp->reginfo, txn->off);
+ td = R_ADDR(&txn->mgrp->reginfo, txn->off);
while (td->parent != INVALID_ROFF)
- td = (TXN_DETAIL *)R_ADDR(txn->mgrp->dbenv,
- &txn->mgrp->reginfo, td->parent);
+ td = R_ADDR(&txn->mgrp->reginfo, td->parent);
lsnp = &td->begin_lsn;
if (IS_ZERO_LSN(*lsnp))
diff --git a/db/txn/txn_recover.c b/db/txn/txn_recover.c
index 0d15f57eb..79b88b727 100644
--- a/db/txn/txn_recover.c
+++ b/db/txn/txn_recover.c
@@ -4,7 +4,7 @@
* Copyright (c) 2001-2004
* Sleepycat Software. All rights reserved.
*
- * $Id: txn_recover.c,v 1.53 2004/09/22 17:41:10 bostic Exp $
+ * $Id: txn_recover.c,v 1.54 2004/10/15 16:59:44 bostic Exp $
*/
#include "db_config.h"
@@ -94,7 +94,7 @@ __txn_map_gid(dbenv, gid, tdp, offp)
if (*tdp == NULL)
return (EINVAL);
- *offp = R_OFFSET(dbenv, &mgr->reginfo, *tdp);
+ *offp = R_OFFSET(&mgr->reginfo, *tdp);
return (0);
}
@@ -256,7 +256,7 @@ __txn_get_prepared(dbenv, xids, txns, count, retp, flags)
goto err;
}
__txn_continue(dbenv,
- prepp->txn, td, R_OFFSET(dbenv, &mgr->reginfo, td));
+ prepp->txn, td, R_OFFSET(&mgr->reginfo, td));
F_SET(prepp->txn, TXN_MALLOC);
memcpy(prepp->gid, td->xid, sizeof(td->xid));
prepp++;
diff --git a/db/txn/txn_region.c b/db/txn/txn_region.c
index 55a5310f9..82d4543af 100644
--- a/db/txn/txn_region.c
+++ b/db/txn/txn_region.c
@@ -4,7 +4,7 @@
* Copyright (c) 1996-2004
* Sleepycat Software. All rights reserved.
*
- * $Id: txn_region.c,v 11.86 2004/09/22 17:41:10 bostic Exp $
+ * $Id: txn_region.c,v 11.87 2004/10/15 16:59:44 bostic Exp $
*/
#include "db_config.h"
@@ -70,7 +70,7 @@ __txn_open(dbenv)
/* Set the local addresses. */
tmgrp->reginfo.primary =
- R_ADDR(dbenv, &tmgrp->reginfo, tmgrp->reginfo.rp->primary);
+ R_ADDR(&tmgrp->reginfo, tmgrp->reginfo.rp->primary);
/* Acquire a mutex to protect the active TXN list. */
if (F_ISSET(dbenv, DB_ENV_THREAD) &&
@@ -139,7 +139,7 @@ __txn_init(dbenv, tmgrp)
return (ret);
}
tmgrp->reginfo.rp->primary =
- R_OFFSET(dbenv, &tmgrp->reginfo, tmgrp->reginfo.primary);
+ R_OFFSET(&tmgrp->reginfo, tmgrp->reginfo.primary);
region = tmgrp->reginfo.primary;
memset(region, 0, sizeof(*region));
@@ -162,7 +162,7 @@ __txn_init(dbenv, tmgrp)
return (ret);
}
__db_maintinit(&tmgrp->reginfo, addr, TXN_MAINT_SIZE);
- region->maint_off = R_OFFSET(dbenv, &tmgrp->reginfo, addr);
+ region->maint_off = R_OFFSET(&tmgrp->reginfo, addr);
#endif
return (0);
}
@@ -265,7 +265,7 @@ __txn_dbenv_refresh(dbenv)
if (TAILQ_FIRST(&tmgrp->txn_chain) != NULL) {
while ((txnp = TAILQ_FIRST(&tmgrp->txn_chain)) != NULL) {
/* Prepared transactions are OK. */
- td = (TXN_DETAIL *)R_ADDR(dbenv, reginfo, txnp->off);
+ td = R_ADDR(reginfo, txnp->off);
txnid = txnp->txnid;
if (td->status == TXN_PREPARED) {
if ((ret = __txn_discard(txnp, 0)) != 0) {
@@ -357,12 +357,11 @@ __txn_region_destroy(dbenv, infop)
#ifdef HAVE_MUTEX_SYSTEM_RESOURCES
DB_TXNREGION *region;
- region = R_ADDR(dbenv, infop, infop->rp->primary);
+ region = R_ADDR(infop, infop->rp->primary);
- __db_shlocks_destroy(infop, R_ADDR(dbenv, infop, region->maint_off));
+ __db_shlocks_destroy(infop, R_ADDR(infop, region->maint_off));
if (infop->primary != NULL && F_ISSET(dbenv, DB_ENV_PRIVATE))
- __db_shalloc_free(infop,
- R_ADDR(dbenv, infop, region->maint_off));
+ __db_shalloc_free(infop, R_ADDR(infop, region->maint_off));
#endif
if (infop->primary != NULL && F_ISSET(dbenv, DB_ENV_PRIVATE))
__db_shalloc_free(infop, infop->primary);
diff --git a/db/txn/txn_stat.c b/db/txn/txn_stat.c
index e9536b67c..2f9b8357c 100644
--- a/db/txn/txn_stat.c
+++ b/db/txn/txn_stat.c
@@ -4,7 +4,7 @@
* Copyright (c) 1996-2004
* Sleepycat Software. All rights reserved.
*
- * $Id: txn_stat.c,v 11.36 2004/09/15 21:49:21 mjc Exp $
+ * $Id: txn_stat.c,v 11.37 2004/10/15 16:59:44 bostic Exp $
*/
#include "db_config.h"
@@ -124,7 +124,7 @@ __txn_stat(dbenv, statp, flags)
stats->st_txnarray[ndx].parentid = TXN_INVALID;
else
stats->st_txnarray[ndx].parentid =
- ((TXN_DETAIL *)R_ADDR(dbenv, &mgr->reginfo,
+ ((TXN_DETAIL *)R_ADDR(&mgr->reginfo,
txnp->parent))->txnid;
stats->st_txnarray[ndx].lsn = txnp->begin_lsn;
if ((stats->st_txnarray[ndx].xa_status = txnp->xa_status) != 0)
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 02:35:29 +0000