diff options
| -rw-r--r-- | src/btree/bt_evict.c | 4 | ||||
| -rw-r--r-- | src/conn/conn_open.c | 2 | ||||
| -rw-r--r-- | src/include/btree.h | 2 | ||||
| -rw-r--r-- | src/include/btree.i | 2 | ||||
| -rw-r--r-- | src/support/hazard.c | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/src/btree/bt_evict.c b/src/btree/bt_evict.c index 68e31082bae..3964e28300c 100644 --- a/src/btree/bt_evict.c +++ b/src/btree/bt_evict.c @@ -493,7 +493,7 @@ __wt_sync_file(WT_SESSION_IMPL *session, int syncop) /* * The first pass walks all cache leaf pages, waiting for * concurrent activity in a page to be resolved, acquiring - * hazard references to prevent eviction. + * hazard pointers to prevent eviction. */ flags = WT_TREE_CACHE | WT_TREE_SKIP_INTL; if (syncop == WT_SYNC_CHECKPOINT) @@ -966,7 +966,7 @@ __evict_get_page( /* * A pathological case: if we're the oldest transaction in the system * and the eviction server is stuck trying to find space, abort the - * transaction to give up all hazard references before trying again. + * transaction to give up all hazard pointers before trying again. */ if (is_app && F_ISSET(cache, WT_EVICT_STUCK) && __wt_txn_am_oldest(session)) { diff --git a/src/conn/conn_open.c b/src/conn/conn_open.c index eab3276122a..81f334143a8 100644 --- a/src/conn/conn_open.c +++ b/src/conn/conn_open.c @@ -153,7 +153,7 @@ __wt_connection_close(WT_CONNECTION_IMPL *conn) session = conn->default_session = &conn->dummy_session; } - /* Free the hazard references for all sessions. */ + /* Free the hazard pointers for all sessions. */ if ((s = conn->sessions) != NULL) for (i = 0; i < conn->session_size; ++s, ++i) if (s != session) diff --git a/src/include/btree.h b/src/include/btree.h index 61ebc40d5db..686bbd14d3d 100644 --- a/src/include/btree.h +++ b/src/include/btree.h @@ -112,7 +112,7 @@ struct __wt_btree { /* Flags values up to 0xff are reserved for WT_DHANDLE_* */ #define WT_BTREE_BULK 0x00100 /* Bulk-load handle */ #define WT_BTREE_NO_EVICTION 0x00200 /* Disable eviction */ -#define WT_BTREE_NO_HAZARD 0x00400 /* Disable hazard references */ +#define WT_BTREE_NO_HAZARD 0x00400 /* Disable hazard pointers */ #define WT_BTREE_SALVAGE 0x00800 /* Handle is for salvage */ #define WT_BTREE_UPGRADE 0x01000 /* Handle is for upgrade */ #define WT_BTREE_VERIFY 0x02000 /* Handle is for verify */ diff --git a/src/include/btree.i b/src/include/btree.i index 34399d75724..9b0367b4567 100644 --- a/src/include/btree.i +++ b/src/include/btree.i @@ -165,7 +165,7 @@ __wt_cache_read_gen_set(WT_SESSION_IMPL *session) /* * We return read-generations from the future (where "the future" is * measured by increments of the global read generation). The reason - * is because when acquiring a new hazard reference on a page, we can + * is because when acquiring a new hazard pointer for a page, we can * check its read generation, and if the read generation isn't less * than the current global generation, we don't bother updating the * page. In other words, the goal is to avoid some number of updates diff --git a/src/support/hazard.c b/src/support/hazard.c index daf88329ea9..6cb821816ab 100644 --- a/src/support/hazard.c +++ b/src/support/hazard.c @@ -186,7 +186,7 @@ __wt_hazard_close(WT_SESSION_IMPL *session) /* * Check for a set hazard pointer and complain if we find one. We could - * just check the session's hazard reference count, but this is a useful + * just check the session's hazard pointer count, but this is a useful * diagnostic. */ for (found = 0, hp = session->hazard; |