Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

os/bluestore: add "_" prefix for internal methods #13409

Merged
merged 1 commit into from Feb 14, 2017
Merged

os/bluestore: add "_" prefix for internal methods #13409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/os/bluestore/BlueStore.cc
View file
Open in desktop
Expand Up @@ -7118,7 +7118,7 @@ void BlueStore::_txc_finish_kv(TransContext *txc)
if (!txc->oncommits.empty()) {
finishers[n]->queue(txc->oncommits);
}
op_queue_release_throttle(txc);
_op_queue_release_throttle(txc);
}

void BlueStore::BSPerfTracker::update_from_perfcounters(
Expand Down Expand Up @@ -7157,7 +7157,7 @@ void BlueStore::_txc_finish(TransContext *txc)
txc->removed_collections.pop_front();
}

op_queue_release_wal_throttle(txc);
_op_queue_release_wal_throttle(txc);

OpSequencerRef osr = txc->osr;
{
Expand Down Expand Up @@ -7606,8 +7606,8 @@ int BlueStore::queue_transactions(
if (handle)
handle->suspend_tp_timeout();

op_queue_reserve_throttle(txc);
op_queue_reserve_wal_throttle(txc);
_op_queue_reserve_throttle(txc);
_op_queue_reserve_wal_throttle(txc);

if (handle)
handle->reset_tp_timeout();
Expand All @@ -7621,7 +7621,7 @@ int BlueStore::queue_transactions(
return 0;
}

void BlueStore::op_queue_reserve_throttle(TransContext *txc)
void BlueStore::_op_queue_reserve_throttle(TransContext *txc)
{
throttle_ops.get(txc->ops);
throttle_bytes.get(txc->bytes);
Expand All @@ -7630,7 +7630,7 @@ void BlueStore::op_queue_reserve_throttle(TransContext *txc)
logger->set(l_bluestore_cur_bytes_in_queue, throttle_bytes.get_current());
}

void BlueStore::op_queue_release_throttle(TransContext *txc)
void BlueStore::_op_queue_release_throttle(TransContext *txc)
{
throttle_ops.put(txc->ops);
throttle_bytes.put(txc->bytes);
Expand All @@ -7639,7 +7639,7 @@ void BlueStore::op_queue_release_throttle(TransContext *txc)
logger->set(l_bluestore_cur_bytes_in_queue, throttle_bytes.get_current());
}

void BlueStore::op_queue_reserve_wal_throttle(TransContext *txc)
void BlueStore::_op_queue_reserve_wal_throttle(TransContext *txc)
{
throttle_wal_ops.get(txc->ops);
throttle_wal_bytes.get(txc->bytes);
Expand All @@ -7648,7 +7648,7 @@ void BlueStore::op_queue_reserve_wal_throttle(TransContext *txc)
logger->set(l_bluestore_cur_bytes_in_wal_queue, throttle_wal_bytes.get_current());
}

void BlueStore::op_queue_release_wal_throttle(TransContext *txc)
void BlueStore::_op_queue_release_wal_throttle(TransContext *txc)
{
throttle_wal_ops.put(txc->ops);
throttle_wal_bytes.put(txc->bytes);
Expand Down
8 changes: 4 additions & 4 deletions src/os/bluestore/BlueStore.h
View file
Open in desktop
Expand Up @@ -2311,10 +2311,10 @@ class BlueStore : public ObjectStore,
CollectionRef& d,
unsigned bits, int rem);

void op_queue_reserve_throttle(TransContext *txc);
void op_queue_release_throttle(TransContext *txc);
void op_queue_reserve_wal_throttle(TransContext *txc);
void op_queue_release_wal_throttle(TransContext *txc);
void _op_queue_reserve_throttle(TransContext *txc);
void _op_queue_release_throttle(TransContext *txc);
void _op_queue_reserve_wal_throttle(TransContext *txc);
void _op_queue_release_wal_throttle(TransContext *txc);
};

inline ostream& operator<<(ostream& out, const BlueStore::OpSequencer& s) {
Expand Down