diff options
| author | sueloverso <sue@mongodb.com> | 2015-08-13 09:28:53 -0400 |
|---|---|---|
| committer | Michael Cahill <michael.cahill@mongodb.com> | 2015-08-14 16:54:47 +1000 |
| commit | e8e1050c4f9cc6295f45949cfac8eeef2b9c1f43 (patch) | |
| tree | 3f8b87f9636eb639187e73be6c881173eb11b5fc /src | |
| parent | 5167870ac7e1ab1d46af3af9eb54b91ee04b2735 (diff) | |
| download | mongo-e8e1050c4f9cc6295f45949cfac8eeef2b9c1f43.tar.gz | |
Merge pull request #2119 from wiredtiger/tailq-simplify
Minor cleanups to tailq use, s_define searching.
(cherry picked from commit f12c69449d832488b8079aff9d1f4459dd34649d)
Diffstat (limited to 'src')
| -rw-r--r-- | src/lsm/lsm_manager.c | 14 | ||||
| -rw-r--r-- | src/txn/txn_nsnap.c | 4 |
2 files changed, 5 insertions, 13 deletions
diff --git a/src/lsm/lsm_manager.c b/src/lsm/lsm_manager.c index 84c509158d1..1ea41f24ee2 100644 --- a/src/lsm/lsm_manager.c +++ b/src/lsm/lsm_manager.c @@ -274,7 +274,7 @@ __wt_lsm_manager_destroy(WT_SESSION_IMPL *session) WT_CONNECTION_IMPL *conn; WT_DECL_RET; WT_LSM_MANAGER *manager; - WT_LSM_WORK_UNIT *current, *next; + WT_LSM_WORK_UNIT *current; WT_SESSION *wt_session; uint32_t i; uint64_t removed; @@ -298,23 +298,17 @@ __wt_lsm_manager_destroy(WT_SESSION_IMPL *session) manager->lsm_worker_cookies[0].tid = 0; /* Release memory from any operations left on the queue. */ - for (current = TAILQ_FIRST(&manager->switchqh); - current != NULL; current = next) { - next = TAILQ_NEXT(current, q); + while ((current = TAILQ_FIRST(&manager->switchqh)) != NULL) { TAILQ_REMOVE(&manager->switchqh, current, q); ++removed; __wt_lsm_manager_free_work_unit(session, current); } - for (current = TAILQ_FIRST(&manager->appqh); - current != NULL; current = next) { - next = TAILQ_NEXT(current, q); + while ((current = TAILQ_FIRST(&manager->appqh)) != NULL) { TAILQ_REMOVE(&manager->appqh, current, q); ++removed; __wt_lsm_manager_free_work_unit(session, current); } - for (current = TAILQ_FIRST(&manager->managerqh); - current != NULL; current = next) { - next = TAILQ_NEXT(current, q); + while ((current = TAILQ_FIRST(&manager->managerqh)) != NULL) { TAILQ_REMOVE(&manager->managerqh, current, q); ++removed; __wt_lsm_manager_free_work_unit(session, current); diff --git a/src/txn/txn_nsnap.c b/src/txn/txn_nsnap.c index d0316ecef95..be736cc1c98 100644 --- a/src/txn/txn_nsnap.c +++ b/src/txn/txn_nsnap.c @@ -358,9 +358,7 @@ __wt_txn_named_snapshot_destroy(WT_SESSION_IMPL *session) txn_global = &S2C(session)->txn_global; txn_global->nsnap_oldest_id = WT_TXN_NONE; - while (!TAILQ_EMPTY(&txn_global->nsnaph)) { - nsnap = TAILQ_FIRST(&txn_global->nsnaph); - WT_ASSERT(session, nsnap != NULL); + while ((nsnap = TAILQ_FIRST(&txn_global->nsnaph)) != NULL) { TAILQ_REMOVE(&txn_global->nsnaph, nsnap, q); __nsnap_destroy(session, nsnap); } |