diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/btree/bt_discard.c | 2 | ||||
| -rw-r--r-- | src/btree/bt_slvg.c | 4 | ||||
| -rw-r--r-- | src/btree/bt_split.c | 2 | ||||
| -rw-r--r-- | src/evict/evict_page.c | 4 | ||||
| -rw-r--r-- | src/include/btree.i | 55 | ||||
| -rw-r--r-- | src/reconcile/rec_write.c | 45 |
6 files changed, 59 insertions, 53 deletions
diff --git a/src/btree/bt_discard.c b/src/btree/bt_discard.c index 54d9761c487..54b07513089 100644 --- a/src/btree/bt_discard.c +++ b/src/btree/bt_discard.c @@ -269,7 +269,7 @@ __wt_free_ref( * Free any address allocation; if there's no linked WT_REF page, it * must be allocated. */ - __wt_ref_free_addr(session, ref); + __wt_ref_addr_free(session, ref); /* Free any page-deleted information. */ if (ref->page_del != NULL) { diff --git a/src/btree/bt_slvg.c b/src/btree/bt_slvg.c index e4a860bb421..756ffd98f3a 100644 --- a/src/btree/bt_slvg.c +++ b/src/btree/bt_slvg.c @@ -1290,7 +1290,7 @@ __slvg_col_build_leaf(WT_SESSION_IMPL *session, WT_TRACK *trk, WT_REF *ref) * would have been lost.) Clear the reference addr so eviction doesn't * free the underlying blocks. */ - __wt_ref_free_addr(session, ref); + __wt_ref_addr_free(session, ref); /* Write the new version of the leaf page to disk. */ WT_ERR(__slvg_modify_init(session, page)); @@ -2011,7 +2011,7 @@ __slvg_row_build_leaf( * would have been lost.) Clear the reference addr so eviction doesn't * free the underlying blocks. */ - __wt_ref_free_addr(session, ref); + __wt_ref_addr_free(session, ref); /* Write the new version of the leaf page to disk. */ WT_ERR(__slvg_modify_init(session, page)); diff --git a/src/btree/bt_split.c b/src/btree/bt_split.c index e2031553aed..631aca0d5c0 100644 --- a/src/btree/bt_split.c +++ b/src/btree/bt_split.c @@ -895,7 +895,7 @@ __split_parent(WT_SESSION_IMPL *session, WT_REF *ref, WT_REF **ref_new, */ WT_ASSERT(session, next_ref->page_del == NULL); - __wt_ref_free_addr(session, next_ref); + WT_TRET(__wt_ref_block_free(session, next_ref)); WT_TRET(__split_safe_free( session, split_gen, exclusive, next_ref, sizeof(WT_REF))); parent_decr += sizeof(WT_REF); diff --git a/src/evict/evict_page.c b/src/evict/evict_page.c index 9281e7cdb2d..e5ec2ad7a8c 100644 --- a/src/evict/evict_page.c +++ b/src/evict/evict_page.c @@ -248,7 +248,7 @@ __evict_page_dirty_update(WT_SESSION_IMPL *session, WT_REF *ref, bool closing) switch (mod->rec_result) { case WT_PM_REC_EMPTY: /* Page is empty */ /* Discard the parent's address. */ - __wt_ref_free_addr(session, ref); + __wt_ref_addr_free(session, ref); /* * Update the parent to reference a deleted page. The fact that @@ -303,7 +303,7 @@ __evict_page_dirty_update(WT_SESSION_IMPL *session, WT_REF *ref, bool closing) return (EBUSY); /* Discard the parent's address. */ - __wt_ref_free_addr(session, ref); + __wt_ref_addr_free(session, ref); /* * Update the parent to reference the replacement page. diff --git a/src/include/btree.i b/src/include/btree.i index 02633c3206a..3e2e7158e04 100644 --- a/src/include/btree.i +++ b/src/include/btree.i @@ -38,6 +38,23 @@ __wt_page_is_modified(WT_PAGE *page) } /* + * __wt_btree_block_free -- + * Helper function to free a block from the current tree. + */ +static inline int +__wt_btree_block_free( + WT_SESSION_IMPL *session, const uint8_t *addr, size_t addr_size) +{ + WT_BM *bm; + WT_BTREE *btree; + + btree = S2BT(session); + bm = btree->bm; + + return (bm->free(bm, session, addr, addr_size)); +} + +/* * __wt_cache_page_inmem_incr -- * Increment a page's memory footprint in the cache. */ @@ -466,19 +483,20 @@ __wt_off_page(WT_PAGE *page, const void *p) } /* - * __wt_ref_free_addr -- + * __wt_ref_addr_free -- * Free the address in a reference, if necessary. */ static inline void -__wt_ref_free_addr(WT_SESSION_IMPL *session, WT_REF *ref) +__wt_ref_addr_free(WT_SESSION_IMPL *session, WT_REF *ref) { - if (ref->addr != NULL) { - if (ref->home == NULL || __wt_off_page(ref->home, ref->addr)) { - __wt_free(session, ((WT_ADDR *)ref->addr)->addr); - __wt_free(session, ref->addr); - } else - ref->addr = NULL; + if (ref->addr == NULL) + return; + + if (ref->home == NULL || __wt_off_page(ref->home, ref->addr)) { + __wt_free(session, ((WT_ADDR *)ref->addr)->addr); + __wt_free(session, ref->addr); } + ref->addr = NULL; } /* @@ -979,6 +997,27 @@ __wt_ref_info(WT_SESSION_IMPL *session, } /* + * __wt_ref_block_free -- + * Free the on-disk block for a reference and clear the address. + */ +static inline int +__wt_ref_block_free(WT_SESSION_IMPL *session, WT_REF *ref) +{ + const uint8_t *addr; + size_t addr_size; + + if (ref->addr == NULL) + return (0); + + WT_RET(__wt_ref_info(session, ref, &addr, &addr_size, NULL)); + WT_RET(__wt_btree_block_free(session, addr, addr_size)); + + /* Clear the address (so we don't free it twice). */ + __wt_ref_addr_free(session, ref); + return (0); +} + +/* * __wt_leaf_page_can_split -- * Check whether a page can be split in memory. */ diff --git a/src/reconcile/rec_write.c b/src/reconcile/rec_write.c index 0e1e7498568..21cc68ed119 100644 --- a/src/reconcile/rec_write.c +++ b/src/reconcile/rec_write.c @@ -985,23 +985,6 @@ __rec_bnd_cleanup(WT_SESSION_IMPL *session, WT_RECONCILE *r, bool destroy) } /* - * __rec_block_free -- - * Helper function to free a block. - */ -static int -__rec_block_free( - WT_SESSION_IMPL *session, const uint8_t *addr, size_t addr_size) -{ - WT_BM *bm; - WT_BTREE *btree; - - btree = S2BT(session); - bm = btree->bm; - - return (bm->free(bm, session, addr, addr_size)); -} - -/* * __rec_update_save -- * Save a WT_UPDATE list for later restoration. */ @@ -1343,8 +1326,6 @@ __rec_child_deleted(WT_SESSION_IMPL *session, WT_RECONCILE *r, WT_REF *ref, WT_CHILD_STATE *statep) { WT_PAGE_DELETED *page_del; - size_t addr_size; - const uint8_t *addr; page_del = ref->page_del; @@ -1392,11 +1373,8 @@ __rec_child_deleted(WT_SESSION_IMPL *session, */ if (ref->addr != NULL && (page_del == NULL || - __wt_txn_visible_all(session, page_del->txnid))) { - WT_RET(__wt_ref_info(session, ref, &addr, &addr_size, NULL)); - WT_RET(__rec_block_free(session, addr, addr_size)); - __wt_ref_free_addr(session, ref); - } + __wt_txn_visible_all(session, page_del->txnid))) + WT_RET(__wt_ref_block_free(session, ref)); /* * If the original page is gone, we can skip the slot on the internal @@ -5312,7 +5290,7 @@ __rec_split_discard(WT_SESSION_IMPL *session, WT_PAGE *page) if (multi->addr.reuse) multi->addr.addr = NULL; else { - WT_RET(__rec_block_free(session, + WT_RET(__wt_btree_block_free(session, multi->addr.addr, multi->addr.size)); __wt_free(session, multi->addr.addr); } @@ -5395,8 +5373,6 @@ __rec_write_wrapup(WT_SESSION_IMPL *session, WT_RECONCILE *r, WT_PAGE *page) WT_BTREE *btree; WT_PAGE_MODIFY *mod; WT_REF *ref; - size_t addr_size; - const uint8_t *addr; btree = S2BT(session); bm = btree->bm; @@ -5421,16 +5397,7 @@ __rec_write_wrapup(WT_SESSION_IMPL *session, WT_RECONCILE *r, WT_PAGE *page) */ if (__wt_ref_is_root(ref)) break; - if (ref->addr != NULL) { - /* - * Free the page and clear the address (so we don't free - * it twice). - */ - WT_RET(__wt_ref_info( - session, ref, &addr, &addr_size, NULL)); - WT_RET(__rec_block_free(session, addr, addr_size)); - __wt_ref_free_addr(session, ref); - } + WT_RET(__wt_ref_block_free(session, ref)); break; case WT_PM_REC_EMPTY: /* Page deleted */ break; @@ -5448,7 +5415,7 @@ __rec_write_wrapup(WT_SESSION_IMPL *session, WT_RECONCILE *r, WT_PAGE *page) * are checkpoints, and must be explicitly dropped. */ if (!__wt_ref_is_root(ref)) - WT_RET(__rec_block_free(session, + WT_RET(__wt_btree_block_free(session, mod->mod_replace.addr, mod->mod_replace.size)); /* Discard the replacement page's address. */ @@ -5612,7 +5579,7 @@ __rec_write_wrapup_err(WT_SESSION_IMPL *session, WT_RECONCILE *r, WT_PAGE *page) if (bnd->addr.reuse) bnd->addr.addr = NULL; else { - WT_TRET(__rec_block_free(session, + WT_TRET(__wt_btree_block_free(session, bnd->addr.addr, bnd->addr.size)); __wt_free(session, bnd->addr.addr); } |