diff options
| author | Michael Cahill <michael.cahill@mongodb.com> | 2015-04-30 16:44:07 +1000 |
|---|---|---|
| committer | Michael Cahill <michael.cahill@mongodb.com> | 2015-04-30 16:44:07 +1000 |
| commit | be25c67146cedf2e308e2098aa5f259abbdcae80 (patch) | |
| tree | 297f9345be82eba3742c510096d69f46d65118da /src/lsm/lsm_manager.c | |
| parent | 04a8b8446341b83c1e17996b5fa3979b7d4f518f (diff) | |
| download | mongo-be25c67146cedf2e308e2098aa5f259abbdcae80.tar.gz | |
Rename the locking macros: use "handle list" lock consistently, make the session locking flags sort together. Create a macro for acquiring the checkpoint lock to execute an operation, use it to clean up some repeated boilerplate.
Diffstat (limited to 'src/lsm/lsm_manager.c')
| -rw-r--r-- | src/lsm/lsm_manager.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lsm/lsm_manager.c b/src/lsm/lsm_manager.c index 3d9fc27d1d2..0533e628601 100644 --- a/src/lsm/lsm_manager.c +++ b/src/lsm/lsm_manager.c @@ -423,7 +423,7 @@ __lsm_manager_run_server(WT_SESSION_IMPL *session) if (TAILQ_EMPTY(&conn->lsmqh)) continue; __wt_spin_lock(session, &conn->dhandle_lock); - F_SET(session, WT_SESSION_HANDLE_LIST_LOCKED); + F_SET(session, WT_SESSION_LOCKED_HANDLE_LIST); dhandle_locked = 1; TAILQ_FOREACH(lsm_tree, &S2C(session)->lsmqh, q) { if (!F_ISSET(lsm_tree, WT_LSM_TREE_ACTIVE)) @@ -483,13 +483,13 @@ __lsm_manager_run_server(WT_SESSION_IMPL *session) } } __wt_spin_unlock(session, &conn->dhandle_lock); - F_CLR(session, WT_SESSION_HANDLE_LIST_LOCKED); + F_CLR(session, WT_SESSION_LOCKED_HANDLE_LIST); dhandle_locked = 0; } err: if (dhandle_locked) { __wt_spin_unlock(session, &conn->dhandle_lock); - F_CLR(session, WT_SESSION_HANDLE_LIST_LOCKED); + F_CLR(session, WT_SESSION_LOCKED_HANDLE_LIST); } return (ret); } |