osdc/ObjectCacher: rename lru_* -> bh_lru_*

We'll be adding LRUs for objects, too.

Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/src/osdc/ObjectCacher.cc b/src/osdc/ObjectCacher.cc
index 72dab2ce17148c614145f3e73fedae2f42a06911..4cc919cb4f3e2097035bb5e1bd5d15faebb9875b 100644 (file)
--- a/src/osdc/ObjectCacher.cc
+++ b/src/osdc/ObjectCacher.cc
@@ -446,8 +446,8 @@ ObjectCacher::~ObjectCacher()
       i != objects.end();
       ++i)
     assert(!i->size());
-  assert(lru_rest.lru_get_size() == 0);
-  assert(lru_dirty.lru_get_size() == 0);
+  assert(bh_lru_rest.lru_get_size() == 0);
+  assert(bh_lru_dirty.lru_get_size() == 0);
   assert(dirty_bh.empty());
 }
 
@@ -799,7 +799,7 @@ void ObjectCacher::flush(loff_t amount)
    */
   loff_t did = 0;
   while (amount == 0 || did < amount) {
-    BufferHead *bh = (BufferHead*) lru_dirty.lru_get_next_expire();
+    BufferHead *bh = (BufferHead*) bh_lru_dirty.lru_get_next_expire();
     if (!bh) break;
     if (bh->last_write > cutoff) break;
 
@@ -819,7 +819,7 @@ void ObjectCacher::trim(loff_t max)
            << dendl;
 
   while (get_stat_clean() > max) {
-    BufferHead *bh = (BufferHead*) lru_rest.lru_expire();
+    BufferHead *bh = (BufferHead*) bh_lru_rest.lru_expire();
     if (!bh) break;
     
     ldout(cct, 10) << "trim trimming " << *bh << dendl;
@@ -1210,7 +1210,7 @@ void ObjectCacher::flusher_entry()
       utime_t cutoff = ceph_clock_now(cct);
       cutoff -= max_dirty_age;
       BufferHead *bh = 0;
-      while ((bh = (BufferHead*)lru_dirty.lru_get_next_expire()) != 0 &&
+      while ((bh = (BufferHead*)bh_lru_dirty.lru_get_next_expire()) != 0 &&
             bh->last_write < cutoff) {
        ldout(cct, 10) << "flusher flushing aged dirty bh " << *bh << dendl;
        bh_write(bh);
@@ -1879,13 +1879,13 @@ void ObjectCacher::bh_set_state(BufferHead *bh, int s)
 {
   // move between lru lists?
   if (s == BufferHead::STATE_DIRTY && bh->get_state() != BufferHead::STATE_DIRTY) {
-    lru_rest.lru_remove(bh);
-    lru_dirty.lru_insert_top(bh);
+    bh_lru_rest.lru_remove(bh);
+    bh_lru_dirty.lru_insert_top(bh);
     dirty_bh.insert(bh);
   }
   if (s != BufferHead::STATE_DIRTY && bh->get_state() == BufferHead::STATE_DIRTY) {
-    lru_dirty.lru_remove(bh);
-    lru_rest.lru_insert_top(bh);
+    bh_lru_dirty.lru_remove(bh);
+    bh_lru_rest.lru_insert_top(bh);
     dirty_bh.erase(bh);
   }
   if (s != BufferHead::STATE_ERROR && bh->get_state() == BufferHead::STATE_ERROR) {
@@ -1902,10 +1902,10 @@ void ObjectCacher::bh_add(Object *ob, BufferHead *bh)
 {
   ob->add_bh(bh);
   if (bh->is_dirty()) {
-    lru_dirty.lru_insert_top(bh);
+    bh_lru_dirty.lru_insert_top(bh);
     dirty_bh.insert(bh);
   } else {
-    lru_rest.lru_insert_top(bh);
+    bh_lru_rest.lru_insert_top(bh);
   }
   bh_stat_add(bh);
 }
@@ -1914,10 +1914,10 @@ void ObjectCacher::bh_remove(Object *ob, BufferHead *bh)
 {
   ob->remove_bh(bh);
   if (bh->is_dirty()) {
-    lru_dirty.lru_remove(bh);
+    bh_lru_dirty.lru_remove(bh);
     dirty_bh.erase(bh);
   } else {
-    lru_rest.lru_remove(bh);
+    bh_lru_rest.lru_remove(bh);
   }
   bh_stat_sub(bh);
 }

diff --git a/src/osdc/ObjectCacher.h b/src/osdc/ObjectCacher.h
index fc165a408d541c0c4e3a4150cfb61d4d72596d97..aeb45c85d3ffe4ead829b8a562382bdae50e5729 100644 (file)
--- a/src/osdc/ObjectCacher.h
+++ b/src/osdc/ObjectCacher.h
@@ -310,7 +310,7 @@ class ObjectCacher {
   vector<hash_map<sobject_t, Object*> > objects; // indexed by pool_id
 
   set<BufferHead*>    dirty_bh;
-  LRU   lru_dirty, lru_rest;
+  LRU   bh_lru_dirty, bh_lru_rest;
 
   Cond flusher_cond;
   bool flusher_stop;
@@ -362,9 +362,9 @@ class ObjectCacher {
 
   void touch_bh(BufferHead *bh) {
     if (bh->is_dirty())
-      lru_dirty.lru_touch(bh);
+      bh_lru_dirty.lru_touch(bh);
     else
-      lru_rest.lru_touch(bh);
+      bh_lru_rest.lru_touch(bh);
   }
 
   // bh states
@@ -380,7 +380,7 @@ class ObjectCacher {
   void mark_error(BufferHead *bh) { bh_set_state(bh, BufferHead::STATE_ERROR); };
   void mark_dirty(BufferHead *bh) { 
     bh_set_state(bh, BufferHead::STATE_DIRTY); 
-    lru_dirty.lru_touch(bh);
+    bh_lru_dirty.lru_touch(bh);
     //bh->set_dirty_stamp(ceph_clock_now(g_ceph_context));
   };