From: Pan Liu Date: Thu, 27 Oct 2016 10:16:28 +0000 (+0800) Subject: keep original format of Finisher.cc X-Git-Tag: v11.1.0~417^2~2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=51c501cd8425709c327a327dc0c5d89eb482b957;p=ceph.git keep original format of Finisher.cc Signed-off-by: Pan Liu pan.liu@istuary.com --- diff --git a/src/common/Finisher.cc b/src/common/Finisher.cc index a4301f064e84..7e2625768a84 100644 --- a/src/common/Finisher.cc +++ b/src/common/Finisher.cc @@ -63,25 +63,25 @@ void *Finisher::finisher_thread_entry() // Now actually process the contexts. for (vector::iterator p = ls.begin(); - p != ls.end(); - ++p) { - if (*p) { - (*p)->complete(0); - } else { - // When an item is NULL in the finisher_queue, it means - // we should instead process an item from finisher_queue_rval, - // which has a parameter for complete() other than zero. - // This preserves the order while saving some storage. - assert(!ls_rval.empty()); - Context *c = ls_rval.front().first; - c->complete(ls_rval.front().second); - ls_rval.pop_front(); - } - if (logger) { - logger->dec(l_finisher_queue_len); + p != ls.end(); + ++p) { + if (*p) { + (*p)->complete(0); + } else { + // When an item is NULL in the finisher_queue, it means + // we should instead process an item from finisher_queue_rval, + // which has a parameter for complete() other than zero. + // This preserves the order while saving some storage. + assert(!ls_rval.empty()); + Context *c = ls_rval.front().first; + c->complete(ls_rval.front().second); + ls_rval.pop_front(); + } + if (logger) { + logger->dec(l_finisher_queue_len); end = ceph_clock_now(cct); - logger->tinc(l_finisher_complete_lat, end - start); - start = end; + logger->tinc(l_finisher_complete_lat, end - start); + start = end; } } ldout(cct, 10) << "finisher_thread done with " << ls << dendl;