objectcacher: cleanup formatting

This commit is contained in:
Sage Weil 2010-06-04 16:10:44 -07:00
parent 462552ab9d
commit a76d8fc65d
2 changed files with 19 additions and 7 deletions

View File

@ -77,7 +77,7 @@ void ObjectCacher::Object::merge_left(BufferHead *left, BufferHead *right)
dout(10) << "merge_left " << *left << " + " << *right << dendl;
oc->bh_remove(this, right);
oc->bh_stat_sub(left);
left->set_length( left->length() + right->length());
left->set_length(left->length() + right->length());
oc->bh_stat_add(left);
// data

View File

@ -323,8 +323,12 @@ class ObjectCacher {
void bh_stat_add(BufferHead *bh) {
switch (bh->get_state()) {
case BufferHead::STATE_MISSING: stat_missing += bh->length(); break;
case BufferHead::STATE_CLEAN: stat_clean += bh->length(); break;
case BufferHead::STATE_MISSING:
stat_missing += bh->length();
break;
case BufferHead::STATE_CLEAN:
stat_clean += bh->length();
break;
case BufferHead::STATE_DIRTY:
stat_dirty += bh->length();
bh->ob->oset->dirty_tx += bh->length();
@ -333,14 +337,20 @@ class ObjectCacher {
stat_tx += bh->length();
bh->ob->oset->dirty_tx += bh->length();
break;
case BufferHead::STATE_RX: stat_rx += bh->length(); break;
case BufferHead::STATE_RX:
stat_rx += bh->length();
break;
}
if (stat_waiter) stat_cond.Signal();
}
void bh_stat_sub(BufferHead *bh) {
switch (bh->get_state()) {
case BufferHead::STATE_MISSING: stat_missing -= bh->length(); break;
case BufferHead::STATE_CLEAN: stat_clean -= bh->length(); break;
case BufferHead::STATE_MISSING:
stat_missing -= bh->length();
break;
case BufferHead::STATE_CLEAN:
stat_clean -= bh->length();
break;
case BufferHead::STATE_DIRTY:
stat_dirty -= bh->length();
bh->ob->oset->dirty_tx -= bh->length();
@ -349,7 +359,9 @@ class ObjectCacher {
stat_tx -= bh->length();
bh->ob->oset->dirty_tx -= bh->length();
break;
case BufferHead::STATE_RX: stat_rx -= bh->length(); break;
case BufferHead::STATE_RX:
stat_rx -= bh->length();
break;
}
}
loff_t get_stat_tx() { return stat_tx; }