diff options
| author | Michael Cahill <michael.cahill@mongodb.com> | 2015-10-09 17:07:24 +1100 |
|---|---|---|
| committer | Michael Cahill <michael.cahill@mongodb.com> | 2015-10-09 17:07:24 +1100 |
| commit | 0537648e03b4fbaca89b009a37b6684863aebcf5 (patch) | |
| tree | f526ab69ba7c2a4ed22379af286d33213e366052 /src/async/async_api.c | |
| parent | 3c856645c8b4340778d9f3c64051f476cbe66f71 (diff) | |
| parent | 544f27de73419dbf4494b9ad826c643dfec38e6c (diff) | |
| download | mongodb-3.2.0-rc1.tar.gz | |
Merge branch 'develop' into mongodb-3.2mongodb-3.2.0-rc1
Diffstat (limited to 'src/async/async_api.c')
| -rw-r--r-- | src/async/async_api.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/async/async_api.c b/src/async/async_api.c index 1d819474728..dc26f2d11c3 100644 --- a/src/async/async_api.c +++ b/src/async/async_api.c @@ -53,7 +53,7 @@ __async_get_format(WT_CONNECTION_IMPL *conn, const char *uri, * for the cursor. */ WT_RET(__wt_open_internal_session( - conn, "async-cursor", true, true, &session)); + conn, "async-cursor", true, 0, &session)); __wt_spin_lock(session, &async->ops_lock); WT_ERR(__wt_calloc_one(session, &af)); WT_ERR(__wt_strdup(session, uri, &af->uri)); @@ -229,7 +229,7 @@ __async_start(WT_SESSION_IMPL *session) { WT_ASYNC *async; WT_CONNECTION_IMPL *conn; - uint32_t i; + uint32_t i, session_flags; conn = S2C(session); conn->async_cfg = 1; @@ -256,9 +256,9 @@ __async_start(WT_SESSION_IMPL *session) * workers and we may want to selectively stop some workers * while leaving the rest running. */ - WT_RET(__wt_open_internal_session(conn, - "async-worker", true, true, &async->worker_sessions[i])); - F_SET(async->worker_sessions[i], WT_SESSION_SERVER_ASYNC); + session_flags = WT_SESSION_SERVER_ASYNC; + WT_RET(__wt_open_internal_session(conn, "async-worker", + true, session_flags, &async->worker_sessions[i])); } for (i = 0; i < conn->async_workers; i++) { /* @@ -305,7 +305,7 @@ __wt_async_reconfig(WT_SESSION_IMPL *session, const char *cfg[]) WT_DECL_RET; WT_SESSION *wt_session; bool run; - uint32_t i; + uint32_t i, session_flags; conn = S2C(session); async = conn->async; @@ -371,10 +371,9 @@ __wt_async_reconfig(WT_SESSION_IMPL *session, const char *cfg[]) /* * Each worker has its own session. */ + session_flags = WT_SESSION_SERVER_ASYNC; WT_RET(__wt_open_internal_session(conn, "async-worker", - true, true, &async->worker_sessions[i])); - F_SET(async->worker_sessions[i], - WT_SESSION_SERVER_ASYNC); + true, session_flags, &async->worker_sessions[i])); } for (i = conn->async_workers; i < tmp_conn.async_workers; i++) { /* |