diff options
| author | Michael Cahill <michael.cahill@mongodb.com> | 2015-04-25 13:02:42 +1000 |
|---|---|---|
| committer | Michael Cahill <michael.cahill@mongodb.com> | 2015-04-25 13:02:42 +1000 |
| commit | 54614a51627afe8c3f17b83271122a29e4726390 (patch) | |
| tree | 6a567f01ff1acdc42e2d60e5951c8635ccf02f6f | |
| parent | 80226f628ca53f9076db8061abaa55dbda1b0674 (diff) | |
| download | mongo-54614a51627afe8c3f17b83271122a29e4726390.tar.gz | |
Fixes after cherry-picking.
| -rw-r--r-- | src/conn/conn_sweep.c | 2 | ||||
| -rw-r--r-- | src/include/connection.h | 3 | ||||
| -rw-r--r-- | src/include/stat.h | 2 | ||||
| -rw-r--r-- | src/log/log.c | 4 |
4 files changed, 6 insertions, 5 deletions
diff --git a/src/conn/conn_sweep.c b/src/conn/conn_sweep.c index 1c5b8ed372a..46f40a6fefd 100644 --- a/src/conn/conn_sweep.c +++ b/src/conn/conn_sweep.c @@ -212,7 +212,7 @@ __wt_sweep_config(WT_SESSION_IMPL *session, const char *cfg[]) WT_RET(__wt_config_gets(session, cfg, "file_manager.close_handle_minimum", &cval)); - conn->sweep_handles = (u_int)cval.val; + conn->sweep_handles_min = (u_int)cval.val; return (0); } diff --git a/src/include/connection.h b/src/include/connection.h index d75053081c7..a95b051fbc0 100644 --- a/src/include/connection.h +++ b/src/include/connection.h @@ -202,6 +202,7 @@ struct __wt_connection_impl { u_int open_btree_count; /* Locked: open writable btree count */ uint32_t next_file_id; /* Locked: file ID counter */ + uint32_t open_file_count; /* Atomic: open file handle count */ /* * WiredTiger allocates space for 50 simultaneous sessions (threads of @@ -337,7 +338,7 @@ struct __wt_connection_impl { WT_CONDVAR *sweep_cond; /* Handle sweep wait mutex */ time_t sweep_idle_time;/* Handle sweep idle time */ time_t sweep_interval;/* Handle sweep interval */ - u_int sweep_handles; /* Handle sweep interval */ + u_int sweep_handles_min;/* Handle sweep minimum open */ /* Locked: collator list */ TAILQ_HEAD(__wt_coll_qh, __wt_named_collator) collqh; diff --git a/src/include/stat.h b/src/include/stat.h index e04e645b3ea..8624ebb456e 100644 --- a/src/include/stat.h +++ b/src/include/stat.h @@ -23,7 +23,7 @@ struct __wt_stats { #define WT_STAT_ATOMIC_INCRV(stats, fld, value) do { \ (void)WT_ATOMIC_ADD8(WT_STAT(stats, fld), (value)); \ } while (0) -#define WT_STAT_ATOMIC_INCR(stats, fld) WT_ATOMIC_ADD(WT_STAT(stats, fld), 1) +#define WT_STAT_ATOMIC_INCR(stats, fld) WT_ATOMIC_ADD8(WT_STAT(stats, fld), 1) #define WT_STAT_DECRV(stats, fld, value) do { \ (stats)->fld.v -= (value); \ } while (0) diff --git a/src/log/log.c b/src/log/log.c index 0cbeaef061e..4a0b8db381a 100644 --- a/src/log/log.c +++ b/src/log/log.c @@ -1473,8 +1473,8 @@ advance: &next_lsn, cookie, firstrecord)); __wt_scr_free(session, &uncitem); } else - WT_ERR((*func)(session, &buf, &rd_lsn, &next_lsn, - cookie, firstrecord)); + WT_ERR((*func)(session, &buf, &rd_lsn, + &next_lsn, cookie, firstrecord)); firstrecord = 0; |