diff options
| author | Michael Cahill <michael.cahill@mongodb.com> | 2015-08-12 20:56:25 +1000 |
|---|---|---|
| committer | Michael Cahill <michael.cahill@mongodb.com> | 2015-08-12 20:56:25 +1000 |
| commit | 7bb09c0377f5160857617c38ab07955f8f4b03f6 (patch) | |
| tree | 2d7041f6e1cc121c743c368406485e39280b551c /src/third_party/wiredtiger/dist | |
| parent | 6d9cbeb53eb9e6d39a24a8ac54b71e105483730b (diff) | |
| download | mongo-7bb09c0377f5160857617c38ab07955f8f4b03f6.tar.gz | |
Import wiredtiger-wiredtiger-2.6.1-500-g26d1ad2.tar.gz from wiredtiger branch mongodb-3.2
Diffstat (limited to 'src/third_party/wiredtiger/dist')
| -rw-r--r-- | src/third_party/wiredtiger/dist/api_err.py | 6 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/dist/s_define.list | 2 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/dist/s_string.ok | 2 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/dist/stat_data.py | 10 |
4 files changed, 12 insertions, 8 deletions
diff --git a/src/third_party/wiredtiger/dist/api_err.py b/src/third_party/wiredtiger/dist/api_err.py index d39f076656f..936c7bb11a7 100644 --- a/src/third_party/wiredtiger/dist/api_err.py +++ b/src/third_party/wiredtiger/dist/api_err.py @@ -100,7 +100,7 @@ tfile.write('''/* DO NOT EDIT: automatically built by dist/api_err.py. */ /* * __wt_wiredtiger_error -- - *\tReturn a constant string for WiredTiger POSIX-standard and errors. + *\tReturn a constant string for POSIX-standard and WiredTiger errors. */ const char * __wt_wiredtiger_error(int error) @@ -119,8 +119,8 @@ for err in errors: tfile.write('''\t} \t/* -\t * POSIX errors are non-negative integers; check for 0 explicitly -\t * in-case the underlying strerror doesn't handle 0, some don't. +\t * POSIX errors are non-negative integers; check for 0 explicitly incase +\t * the underlying strerror doesn't handle 0, some historically didn't. \t */ \tif (error == 0) \t\treturn ("Successful return: 0"); diff --git a/src/third_party/wiredtiger/dist/s_define.list b/src/third_party/wiredtiger/dist/s_define.list index 623a34447a8..a9ae2a10006 100644 --- a/src/third_party/wiredtiger/dist/s_define.list +++ b/src/third_party/wiredtiger/dist/s_define.list @@ -21,8 +21,8 @@ WT_ATOMIC_ADD2 WT_ATOMIC_CAS1 WT_ATOMIC_CAS2 WT_ATOMIC_FETCH_ADD1 -WT_ATOMIC_FETCH_ADD2 WT_ATOMIC_FETCH_ADD4 +WT_ATOMIC_FETCH_ADD8 WT_ATOMIC_STORE1 WT_ATOMIC_STORE2 WT_ATOMIC_SUB1 diff --git a/src/third_party/wiredtiger/dist/s_string.ok b/src/third_party/wiredtiger/dist/s_string.ok index 1ed92b79ba8..a104bb011da 100644 --- a/src/third_party/wiredtiger/dist/s_string.ok +++ b/src/third_party/wiredtiger/dist/s_string.ok @@ -609,6 +609,7 @@ idx ifdef's ikey impl +incase incr incrementing indices @@ -743,6 +744,7 @@ nop noraw notfound notsup +notused nset nsnap nul diff --git a/src/third_party/wiredtiger/dist/stat_data.py b/src/third_party/wiredtiger/dist/stat_data.py index caf68364696..77061b36dcb 100644 --- a/src/third_party/wiredtiger/dist/stat_data.py +++ b/src/third_party/wiredtiger/dist/stat_data.py @@ -208,10 +208,12 @@ connection_stats = [ ########################################## # Dhandle statistics ########################################## - DhandleStat('dh_conn_handles', 'connection dhandles swept'), - DhandleStat('dh_conn_ref', 'connection candidate referenced'), - DhandleStat('dh_conn_sweeps', 'connection sweeps'), - DhandleStat('dh_conn_tod', 'connection time-of-death sets'), + DhandleStat('dh_sweep_close', 'connection sweep dhandles closed'), + DhandleStat('dh_sweep_remove', + 'connection sweep dhandles removed from hash list'), + DhandleStat('dh_sweep_ref', 'connection sweep candidate became referenced'), + DhandleStat('dh_sweep_tod', 'connection sweep time-of-death sets'), + DhandleStat('dh_sweeps', 'connection sweeps'), DhandleStat('dh_session_handles', 'session dhandles swept'), DhandleStat('dh_session_sweeps', 'session sweep attempts'), |