diff options
| author | Keith Bostic <keith@wiredtiger.com> | 2015-11-24 11:29:41 -0500 |
|---|---|---|
| committer | Keith Bostic <keith@wiredtiger.com> | 2015-11-24 11:29:41 -0500 |
| commit | b65381f64c22e804641dc3932f20dcd3902ea7ae (patch) | |
| tree | 75b3039aa0bf7e8722b8b9008f6e123fe1b1b842 | |
| parent | 0019262fed3d6ba0409e198c592279f8e40ec9b7 (diff) | |
| parent | e90b5906b969e9e34c8aa7e304a5983ef8077bca (diff) | |
| download | mongo-b65381f64c22e804641dc3932f20dcd3902ea7ae.tar.gz | |
Merge branch 'develop' into mongodb-3.2mongodb-3.2-rc4
| -rw-r--r-- | src/include/txn.i | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/include/txn.i b/src/include/txn.i index f19cf259174..ef9d5a273cf 100644 --- a/src/include/txn.i +++ b/src/include/txn.i @@ -323,6 +323,7 @@ __wt_txn_id_alloc(WT_SESSION_IMPL *session, bool publish) { WT_TXN_GLOBAL *txn_global; uint64_t id; + u_int i; txn_global = &S2C(session)->txn_global; @@ -353,14 +354,17 @@ __wt_txn_id_alloc(WT_SESSION_IMPL *session, bool publish) if (publish) { session->txn.id = id; - WT_PUBLISH(WT_SESSION_TXN_STATE(session)->id, id); + WT_SESSION_TXN_STATE(session)->id = id; } - while (txn_global->current != id || - !__wt_atomic_casv64(&txn_global->current, id, id + 1)) - __wt_yield(); + for (i = 0; txn_global->current != id; i++) + if (i < 100) + WT_PAUSE(); + else + __wt_yield(); - return (id); + WT_PUBLISH(txn_global->current, id + 1); + return (id); } /* |