diff options
| author | Michael Cahill <michael.cahill@mongodb.com> | 2016-05-05 15:38:12 +1000 |
|---|---|---|
| committer | Michael Cahill <michael.cahill@mongodb.com> | 2016-05-05 15:38:12 +1000 |
| commit | 636a7b25ef3eca6b98009330f4d35337d4f35717 (patch) | |
| tree | 7cc2e03ad96e206cbe73343feef10197023a37da /src/include/txn.h | |
| parent | eaa7b5f0fcc62f356c33a2c56f45b609a73ca5dd (diff) | |
| parent | 75c22bc0c662622c14e5c47d99ff262cede2c6bf (diff) | |
Merge branch 'develop' into mongodb-3.4mongodb-3.3.6
Diffstat (limited to 'src/include/txn.h')
| -rw-r--r-- | src/include/txn.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/include/txn.h b/src/include/txn.h index 1e82e2d982a..d10738cc670 100644 --- a/src/include/txn.h +++ b/src/include/txn.h @@ -74,7 +74,7 @@ struct __wt_txn_global { volatile uint64_t current; /* Current transaction ID. */ /* The oldest running transaction ID (may race). */ - uint64_t last_running; + volatile uint64_t last_running; /* * The oldest transaction ID that is not yet visible to some @@ -82,8 +82,11 @@ struct __wt_txn_global { */ volatile uint64_t oldest_id; - /* Count of scanning threads, or -1 for exclusive access. */ - volatile int32_t scan_count; + /* + * Prevents the oldest ID moving forwards while threads are scanning + * the global transaction state. + */ + WT_RWLOCK *scan_rwlock; /* * Track information about the running checkpoint. The transaction |