diff options
author | Alex Gorrod <alexander.gorrod@mongodb.com> | 2017-02-17 11:16:55 +1100 |
---|---|---|
committer | Alex Gorrod <alexander.gorrod@mongodb.com> | 2017-02-17 11:16:55 +1100 |
commit | e1bcc30da91eedd0b17cebb725cc7e607ffa2340 (patch) | |
tree | f4cf5e09a0b9f9ec6d9e36eeb124d976f5c5b107 /src/async/async_api.c | |
parent | 48a3cbc17fa902528217287fd075c87efb44aebc (diff) | |
parent | 8a1adcc4a1c4c25e1270290a8eb21173f41e83a9 (diff) | |
download | mongodb-3.5.4.tar.gz |
Merge branch 'develop' into mongodb-3.6mongodb-3.5.4
Diffstat (limited to 'src/async/async_api.c')
-rw-r--r-- | src/async/async_api.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/async/async_api.c b/src/async/async_api.c index 54bcb7cd26c..026a008188c 100644 --- a/src/async/async_api.c +++ b/src/async/async_api.c @@ -240,8 +240,7 @@ __async_start(WT_SESSION_IMPL *session) async = conn->async; TAILQ_INIT(&async->formatqh); WT_RET(__wt_spin_init(session, &async->ops_lock, "ops")); - WT_RET(__wt_cond_alloc( - session, "async flush", false, &async->flush_cond)); + WT_RET(__wt_cond_alloc(session, "async flush", &async->flush_cond)); WT_RET(__wt_async_op_init(session)); /* @@ -541,7 +540,7 @@ retry: async->flush_op.state = WT_ASYNCOP_READY; WT_RET(__wt_async_op_enqueue(session, &async->flush_op)); while (async->flush_state != WT_ASYNC_FLUSH_COMPLETE) - __wt_cond_wait(session, async->flush_cond, 100000); + __wt_cond_wait(session, async->flush_cond, 100000, NULL); /* * Flush is done. Clear the flags. */ |