diff options
Diffstat (limited to 'db2/btree')
| -rw-r--r-- | db2/btree/bt_close.c | 4 | ||||
| -rw-r--r-- | db2/btree/bt_conv.c | 22 | ||||
| -rw-r--r-- | db2/btree/bt_cursor.c | 76 | ||||
| -rw-r--r-- | db2/btree/bt_put.c | 4 | ||||
| -rw-r--r-- | db2/btree/bt_rec.c | 13 | ||||
| -rw-r--r-- | db2/btree/bt_recno.c | 38 | ||||
| -rw-r--r-- | db2/btree/btree.src | 8 | ||||
| -rw-r--r-- | db2/btree/btree_auto.c | 14 |
8 files changed, 112 insertions, 67 deletions
diff --git a/db2/btree/bt_close.c b/db2/btree/bt_close.c index 7044599dd2..7dd7139c66 100644 --- a/db2/btree/bt_close.c +++ b/db2/btree/bt_close.c @@ -47,7 +47,7 @@ #include "config.h" #ifndef lint -static const char sccsid[] = "@(#)bt_close.c 10.23 (Sleepycat) 9/2/97"; +static const char sccsid[] = "@(#)bt_close.c 10.24 (Sleepycat) 9/17/97"; #endif /* not lint */ #ifndef NO_SYSTEM_INCLUDES @@ -150,7 +150,7 @@ __bam_upstat(dbp) /* * We use a no-op log call to log the update of the statistics onto the - * metadata page. The dbp->close() call isn't transaction protected to + * metadata page. The Db->close call isn't transaction protected to * start with, and I'm not sure what undoing a statistics update means, * anyway. */ diff --git a/db2/btree/bt_conv.c b/db2/btree/bt_conv.c index c9d5d1bc3e..c89493cbed 100644 --- a/db2/btree/bt_conv.c +++ b/db2/btree/bt_conv.c @@ -8,7 +8,7 @@ #include "config.h" #ifndef lint -static const char sccsid[] = "@(#)bt_conv.c 10.4 (Sleepycat) 9/3/97"; +static const char sccsid[] = "@(#)bt_conv.c 10.5 (Sleepycat) 9/15/97"; #endif /* not lint */ #ifndef NO_SYSTEM_INCLUDES @@ -21,12 +21,11 @@ static const char sccsid[] = "@(#)bt_conv.c 10.4 (Sleepycat) 9/3/97"; #include "btree.h" /* - * __bam_pgin, __bam_pgout -- - * Convert host-specific page layout to/from the host-independent - * format stored on disk. + * __bam_pgin -- + * Convert host-specific page layout from the host-independent format + * stored on disk. * * PUBLIC: int __bam_pgin __P((db_pgno_t, void *, DBT *)); - * PUBLIC: int __bam_pgout __P((db_pgno_t, void *, DBT *)); */ int __bam_pgin(pg, pp, cookie) @@ -39,9 +38,17 @@ __bam_pgin(pg, pp, cookie) pginfo = (DB_PGINFO *)cookie->data; if (!pginfo->needswap) return (0); - return (pg == PGNO_METADATA ? __bam_mswap(pp) : __db_pgin(pg, pp)); + return (pg == PGNO_METADATA ? + __bam_mswap(pp) : __db_pgin(pg, pginfo->db_pagesize, pp)); } +/* + * __bam_pgout -- + * Convert host-specific page layout to the host-independent format + * stored on disk. + * + * PUBLIC: int __bam_pgout __P((db_pgno_t, void *, DBT *)); + */ int __bam_pgout(pg, pp, cookie) db_pgno_t pg; @@ -53,7 +60,8 @@ __bam_pgout(pg, pp, cookie) pginfo = (DB_PGINFO *)cookie->data; if (!pginfo->needswap) return (0); - return (pg == PGNO_METADATA ? __bam_mswap(pp) : __db_pgout(pg, pp)); + return (pg == PGNO_METADATA ? + __bam_mswap(pp) : __db_pgout(pg, pginfo->db_pagesize, pp)); } /* diff --git a/db2/btree/bt_cursor.c b/db2/btree/bt_cursor.c index efae556030..a1266bcd3c 100644 --- a/db2/btree/bt_cursor.c +++ b/db2/btree/bt_cursor.c @@ -8,7 +8,7 @@ #include "config.h" #ifndef lint -static const char sccsid[] = "@(#)bt_cursor.c 10.27 (Sleepycat) 9/3/97"; +static const char sccsid[] = "@(#)bt_cursor.c 10.33 (Sleepycat) 9/24/97"; #endif /* not lint */ #ifndef NO_SYSTEM_INCLUDES @@ -81,7 +81,10 @@ __bam_cursor(dbp, txn, dbcp) dbc->c_get = __bam_c_get; dbc->c_put = __bam_c_put; - /* All cursor structures hang off the main DB structure. */ + /* + * All cursors are queued from the master DB structure. Add the + * cursor to that queue. + */ DB_THREAD_LOCK(dbp); TAILQ_INSERT_HEAD(&dbp->curs_queue, dbc, links); DB_THREAD_UNLOCK(dbp); @@ -99,31 +102,53 @@ __bam_c_close(dbc) DBC *dbc; { DB *dbp; - CURSOR *cp; int ret; DEBUG_LWRITE(dbc->dbp, dbc->txn, "bam_c_close", NULL, NULL, 0); GETHANDLE(dbc->dbp, dbc->txn, &dbp, ret); + + ret = __bam_c_iclose(dbp, dbc); + + PUTHANDLE(dbp); + return (ret); +} + +/* + * __bam_c_iclose -- + * Close a single cursor -- internal version. + * + * PUBLIC: int __bam_c_iclose __P((DB *, DBC *)); + */ +int +__bam_c_iclose(dbp, dbc) + DB *dbp; + DBC *dbc; +{ + CURSOR *cp; + int ret; + cp = dbc->internal; - /* If a cursor key was deleted do the actual deletion. */ - ret = F_ISSET(cp, C_DELETED) ? __bam_c_physdel(dbp, cp, NULL) : 0; + /* If a cursor key was deleted, perform the actual deletion. */ + ret = F_ISSET(cp, C_DELETED) ? __bam_c_physdel(dbp, cp, NULL) : 0; /* Discard any lock if we're not inside a transaction. */ - if (dbp->txn == NULL && cp->lock != LOCK_INVALID) + if (cp->lock != LOCK_INVALID) (void)__BT_TLPUT(dbp, cp->lock); - /* Remove the cursor from the queue. */ - DB_THREAD_LOCK(dbp); - TAILQ_REMOVE(&dbp->curs_queue, dbc, links); - DB_THREAD_UNLOCK(dbp); + /* + * All cursors are queued from the master DB structure. Remove the + * cursor from that queue. + */ + DB_THREAD_LOCK(dbc->dbp); + TAILQ_REMOVE(&dbc->dbp->curs_queue, dbc, links); + DB_THREAD_UNLOCK(dbc->dbp); /* Discard the structures. */ - FREE(cp, sizeof(CURSOR)); + FREE(dbc->internal, sizeof(CURSOR)); FREE(dbc, sizeof(DBC)); - PUTHANDLE(dbp); return (ret); } @@ -235,27 +260,22 @@ __bam_get(argdbp, txn, key, data, flags) if ((ret = __db_getchk(argdbp, key, data, flags)) != 0) return (ret); - /* Build a cursor. */ + /* Build an internal cursor. */ memset(&cp, 0, sizeof(cp)); cp.dbc = &dbc; cp.pgno = cp.dpgno = PGNO_INVALID; cp.lock = LOCK_INVALID; + cp.flags = C_INTERNAL; + /* Build an external cursor. */ memset(&dbc, 0, sizeof(dbc)); dbc.dbp = argdbp; dbc.txn = txn; dbc.internal = &cp; /* Get the key. */ - if ((ret = __bam_c_get(&dbc, - key, data, LF_ISSET(DB_SET_RECNO) ? DB_SET_RECNO : DB_SET)) != 0) - return (ret); - - /* Discard any lock, the cursor didn't really exist. */ - if (cp.lock != LOCK_INVALID) - (void)__BT_TLPUT(argdbp, cp.lock); - - return (0); + return(__bam_c_get(&dbc, + key, data, LF_ISSET(DB_SET_RECNO) ? DB_SET_RECNO : DB_SET)); } /* @@ -275,8 +295,7 @@ __bam_c_get(dbc, key, data, flags) int exact, ret; DEBUG_LREAD(dbc->dbp, dbc->txn, "bam_c_get", - flags == DB_SET || flags == DB_SET_RANGE ? key : NULL, - NULL, flags); + flags == DB_SET || flags == DB_SET_RANGE ? key : NULL, NULL, flags); cp = dbc->internal; @@ -399,6 +418,10 @@ __bam_c_get(dbc, key, data, flags) /* Release the pinned page. */ ret = memp_fput(dbp->mpf, cp->page, 0); + /* Internal cursors don't hold locks. */ + if (F_ISSET(cp, C_INTERNAL) && cp->lock != LOCK_INVALID) + (void)__BT_TLPUT(dbp, cp->lock); + ++t->lstat.bt_get; if (0) { @@ -864,7 +887,7 @@ __bam_c_prev(dbp, cp) * If at the beginning of the page, move to any previous one. * * !!! - * This code handles empty pages and pages with only deleted entries. + * This code handles empty pages and pages with only deleted entries. */ for (;;) { if (indx == 0) { @@ -1472,8 +1495,7 @@ __bam_c_physdel(dbp, cp, h) * empty the current page of duplicates, we don't need to * touch the parent page. */ - if (PREV_PGNO(h) != PGNO_INVALID || - (h != NULL && pgno == h->pgno)) + if (prev_pgno != PGNO_INVALID || (h != NULL && pgno == h->pgno)) goto done; /* diff --git a/db2/btree/bt_put.c b/db2/btree/bt_put.c index 0f0b1e7126..af09f76d41 100644 --- a/db2/btree/bt_put.c +++ b/db2/btree/bt_put.c @@ -47,7 +47,7 @@ #include "config.h" #ifndef lint -static const char sccsid[] = "@(#)bt_put.c 10.24 (Sleepycat) 9/3/97"; +static const char sccsid[] = "@(#)bt_put.c 10.25 (Sleepycat) 9/17/97"; #endif /* not lint */ #ifndef NO_SYSTEM_INCLUDES @@ -99,7 +99,7 @@ __bam_put(argdbp, txn, key, data, flags) t = dbp->internal; retry: /* - * Find the location at which to insert. The call to bt_lookup() + * Find the location at which to insert. The call to __bam_lookup * leaves the returned page pinned. */ if ((ret = __bam_lookup(dbp, key, &exact)) != 0) { diff --git a/db2/btree/bt_rec.c b/db2/btree/bt_rec.c index 07a3d93c74..9aeb395f27 100644 --- a/db2/btree/bt_rec.c +++ b/db2/btree/bt_rec.c @@ -8,7 +8,7 @@ #include "config.h" #ifndef lint -static const char sccsid[] = "@(#)bt_rec.c 10.13 (Sleepycat) 9/3/97"; +static const char sccsid[] = "@(#)bt_rec.c 10.14 (Sleepycat) 9/6/97"; #endif /* not lint */ #ifndef NO_SYSTEM_INCLUDES @@ -298,11 +298,10 @@ __bam_split_recover(logp, dbtp, lsnp, redo, info) goto done; /* Allocate and initialize new left/right child pages. */ - if ((_lp = (PAGE *)malloc(file_dbp->pgsize)) == NULL) - goto nomem; - if ((_rp = (PAGE *)malloc(file_dbp->pgsize)) == NULL) { -nomem: __set_errno(ENOMEM); - __db_err(file_dbp->dbenv, "%s", strerror(errno)); + if ((_lp = (PAGE *)malloc(file_dbp->pgsize)) == NULL || + (_rp = (PAGE *)malloc(file_dbp->pgsize)) == NULL) { + ret = ENOMEM; + __db_err(file_dbp->dbenv, "%s", strerror(ret)); goto out; } if (rootsplit) { @@ -668,7 +667,7 @@ __bam_cadjust_recover(logp, dbtp, lsnp, redo, info) REC_INTRO(__bam_cadjust_read); if ((ret = memp_fget(mpf, &argp->pgno, 0, &pagep)) != 0) { - __set_errno(__db_pgerr(file_dbp, argp->pgno)); + (void)__db_pgerr(file_dbp, argp->pgno); pagep = NULL; goto out; } diff --git a/db2/btree/bt_recno.c b/db2/btree/bt_recno.c index 42ef9cc30d..f7c5cffdc6 100644 --- a/db2/btree/bt_recno.c +++ b/db2/btree/bt_recno.c @@ -8,7 +8,7 @@ #include "config.h" #ifndef lint -static const char sccsid[] = "@(#)bt_recno.c 10.15 (Sleepycat) 9/3/97"; +static const char sccsid[] = "@(#)bt_recno.c 10.19 (Sleepycat) 9/20/97"; #endif /* not lint */ #ifndef NO_SYSTEM_INCLUDES @@ -76,7 +76,7 @@ __ram_open(dbp, type, dbinfo) /* Allocate and initialize the private RECNO structure. */ if ((rp = (RECNO *)calloc(1, sizeof(*rp))) == NULL) - return (errno); + return (ENOMEM); if (dbinfo != NULL) { /* @@ -150,7 +150,7 @@ err: /* If we mmap'd a source file, discard it. */ /* If we allocated room for key/data return, discard it. */ t = dbp->internal; - if (t->bt_rkey.data != NULL) + if (t != NULL && t->bt_rkey.data != NULL) free(t->bt_rkey.data); FREE(rp, sizeof(*rp)); @@ -193,7 +193,10 @@ __ram_cursor(dbp, txn, dbcp) dbc->c_get = __ram_c_get; dbc->c_put = __ram_c_put; - /* All cursor structures hang off the main DB structure. */ + /* + * All cursors are queued from the master DB structure. Add the + * cursor to that queue. + */ DB_THREAD_LOCK(dbp); TAILQ_INSERT_HEAD(&dbp->curs_queue, dbc, links); DB_THREAD_UNLOCK(dbp); @@ -382,16 +385,29 @@ static int __ram_c_close(dbc) DBC *dbc; { - DB *dbp; - DEBUG_LWRITE(dbc->dbp, dbc->txn, "ram_c_close", NULL, NULL, 0); - dbp = dbc->dbp; + return (__ram_c_iclose(dbc->dbp, dbc)); +} - /* Remove the cursor from the queue. */ - DB_THREAD_LOCK(dbp); - TAILQ_REMOVE(&dbp->curs_queue, dbc, links); - DB_THREAD_UNLOCK(dbp); +/* + * __ram_c_iclose -- + * Close a single cursor -- internal version. + * + * PUBLIC: int __ram_c_iclose __P((DB *, DBC *)); + */ +int +__ram_c_iclose(dbp, dbc) + DB *dbp; + DBC *dbc; +{ + /* + * All cursors are queued from the master DB structure. Remove the + * cursor from that queue. + */ + DB_THREAD_LOCK(dbc->dbp); + TAILQ_REMOVE(&dbc->dbp->curs_queue, dbc, links); + DB_THREAD_UNLOCK(dbc->dbp); /* Discard the structures. */ FREE(dbc->internal, sizeof(RCURSOR)); diff --git a/db2/btree/btree.src b/db2/btree/btree.src index 50cc0dd0ff..7c8c4b125f 100644 --- a/db2/btree/btree.src +++ b/db2/btree/btree.src @@ -8,7 +8,7 @@ #include "config.h" #ifndef lint -static const char sccsid[] = "@(#)btree.src 10.3 (Sleepycat) 8/17/97"; +static const char sccsid[] = "@(#)btree.src 10.4 (Sleepycat) 8/27/97"; #endif /* not lint */ PREFIX bam @@ -88,7 +88,7 @@ END /* * BTREE-adj: used to log the adjustment of an index. - * + * * pgno: the page modified. * lsn: the page's original lsn. * indx: the index adjusted. @@ -106,7 +106,7 @@ END /* * BTREE-cadjust: used to adjust the count change in an internal page. - * + * * pgno: the page modified. * lsn: the page's original lsn. * indx: the index to be adjusted. @@ -124,7 +124,7 @@ END /* * BTREE-cdel: used to log the intent-to-delete of a cursor record. - * + * * pgno: the page modified. * lsn: the page's original lsn. * indx: the index to be deleted. diff --git a/db2/btree/btree_auto.c b/db2/btree/btree_auto.c index e6b72252e5..353ee7bc27 100644 --- a/db2/btree/btree_auto.c +++ b/db2/btree/btree_auto.c @@ -119,7 +119,7 @@ __bam_pg_alloc_print(notused1, dbtp, lsnp, notused3, notused4) notused3 = 0; notused4 = NULL; - if((ret = __bam_pg_alloc_read(dbtp->data, &argp)) != 0) + if ((ret = __bam_pg_alloc_read(dbtp->data, &argp)) != 0) return (ret); printf("[%lu][%lu]bam_pg_alloc: rec: %lu txnid %lx prevlsn [%lu][%lu]\n", (u_long)lsnp->file, @@ -284,7 +284,7 @@ __bam_pg_free_print(notused1, dbtp, lsnp, notused3, notused4) notused3 = 0; notused4 = NULL; - if((ret = __bam_pg_free_read(dbtp->data, &argp)) != 0) + if ((ret = __bam_pg_free_read(dbtp->data, &argp)) != 0) return (ret); printf("[%lu][%lu]bam_pg_free: rec: %lu txnid %lx prevlsn [%lu][%lu]\n", (u_long)lsnp->file, @@ -479,7 +479,7 @@ __bam_split_print(notused1, dbtp, lsnp, notused3, notused4) notused3 = 0; notused4 = NULL; - if((ret = __bam_split_read(dbtp->data, &argp)) != 0) + if ((ret = __bam_split_read(dbtp->data, &argp)) != 0) return (ret); printf("[%lu][%lu]bam_split: rec: %lu txnid %lx prevlsn [%lu][%lu]\n", (u_long)lsnp->file, @@ -672,7 +672,7 @@ __bam_rsplit_print(notused1, dbtp, lsnp, notused3, notused4) notused3 = 0; notused4 = NULL; - if((ret = __bam_rsplit_read(dbtp->data, &argp)) != 0) + if ((ret = __bam_rsplit_read(dbtp->data, &argp)) != 0) return (ret); printf("[%lu][%lu]bam_rsplit: rec: %lu txnid %lx prevlsn [%lu][%lu]\n", (u_long)lsnp->file, @@ -848,7 +848,7 @@ __bam_adj_print(notused1, dbtp, lsnp, notused3, notused4) notused3 = 0; notused4 = NULL; - if((ret = __bam_adj_read(dbtp->data, &argp)) != 0) + if ((ret = __bam_adj_read(dbtp->data, &argp)) != 0) return (ret); printf("[%lu][%lu]bam_adj: rec: %lu txnid %lx prevlsn [%lu][%lu]\n", (u_long)lsnp->file, @@ -1007,7 +1007,7 @@ __bam_cadjust_print(notused1, dbtp, lsnp, notused3, notused4) notused3 = 0; notused4 = NULL; - if((ret = __bam_cadjust_read(dbtp->data, &argp)) != 0) + if ((ret = __bam_cadjust_read(dbtp->data, &argp)) != 0) return (ret); printf("[%lu][%lu]bam_cadjust: rec: %lu txnid %lx prevlsn [%lu][%lu]\n", (u_long)lsnp->file, @@ -1157,7 +1157,7 @@ __bam_cdel_print(notused1, dbtp, lsnp, notused3, notused4) notused3 = 0; notused4 = NULL; - if((ret = __bam_cdel_read(dbtp->data, &argp)) != 0) + if ((ret = __bam_cdel_read(dbtp->data, &argp)) != 0) return (ret); printf("[%lu][%lu]bam_cdel: rec: %lu txnid %lx prevlsn [%lu][%lu]\n", (u_long)lsnp->file, |