RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-20 10:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

os/bluestore: simplify flush() wake-up condition

Browse Source 
Clearer, and fewer wakeups.

Signed-off-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2017-03-17 13:54:20 -04:00
parent 52c93f5b71
commit e4d547ede7
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/os/bluestore/BlueStore.cc
View File

@ -7093,9 +7093,6 @@ void BlueStore::_txc_state_proc(TransContext *txc)
} else {
_txc_finalize_kv(txc, txc->t);
txc->state = TransContext::STATE_KV_SUBMITTED;
if (txc->osr->kv_submitted_waiters) {
txc->osr->qcond.notify_all();
}
int r = db->submit_transaction(txc->t);
assert(r == 0);
_txc_applied_kv(txc);
@ -7181,6 +7178,11 @@ void BlueStore::_txc_finish_io(TransContext *txc)
_txc_state_proc(&*p++);
} while (p != osr->q.end() &&
p->state == TransContext::STATE_IO_DONE);
if (osr->kv_submitted_waiters &&
osr->_is_all_kv_submitted()) {
osr->qcond.notify_all();
}
}
void BlueStore::_txc_write_nodes(TransContext *txc, KeyValueDB::Transaction t)
@ -7610,7 +7612,9 @@ void BlueStore::_kv_sync_thread()
txc->state = TransContext::STATE_KV_SUBMITTED;
if (txc->osr->kv_submitted_waiters) {
std::lock_guard<std::mutex> l(txc->osr->qlock);
txc->osr->qcond.notify_all();
if (txc->osr->_is_all_kv_submitted()) {
txc->osr->qcond.notify_all();
}
}
}
if (num_aios) {

18
src/os/bluestore/BlueStore.h
View File

@ -1578,14 +1578,22 @@ public:
qcond.wait(l);
}
bool _is_all_kv_submitted() {
// caller must hold qlock
if (q.empty()) {
return true;
}
TransContext *txc = &q.back();
if (txc->state >= TransContext::STATE_KV_SUBMITTED) {
return true;
}
return false;
}
void flush() override {
std::unique_lock<std::mutex> l(qlock);
while (true) {
if (q.empty()) {
return;
}
TransContext *txc = &q.back();
if (txc->state >= TransContext::STATE_KV_SUBMITTED) {
if (_is_all_kv_submitted()) {
return;
}
++kv_submitted_waiters;