osdc/ObjectCacher: add zero bufferhead state

Wired up, but not yet used.

Treat these as clean.

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

diff --git a/src/osdc/ObjectCacher.cc b/src/osdc/ObjectCacher.cc
index 2c829196940dfb275956a349959005b411683cc6..f8efb5a3f4f33526ea565a24927ac096701bf36c 100644 (file)
--- a/src/osdc/ObjectCacher.cc
+++ b/src/osdc/ObjectCacher.cc
@@ -454,7 +454,7 @@ ObjectCacher::ObjectCacher(CephContext *cct_, string name, WritebackHandler& wb,
     max_size(max_bytes), max_objects(max_objects),
     flush_set_callback(flush_callback), flush_set_callback_arg(flush_callback_arg),
     flusher_stop(false), flusher_thread(this),
-    stat_clean(0), stat_dirty(0), stat_rx(0), stat_tx(0), stat_missing(0),
+    stat_clean(0), stat_zero(0), stat_dirty(0), stat_rx(0), stat_tx(0), stat_missing(0),
     stat_error(0), stat_dirty_waiting(0)
 {
   this->max_dirty_age.set_from_double(max_dirty_age);
@@ -862,7 +862,7 @@ void ObjectCacher::trim(loff_t max_bytes, loff_t max_ob)
       break;
 
     ldout(cct, 10) << "trim trimming " << *bh << dendl;
-    assert(bh->is_clean());
+    assert(bh->is_clean() || bh->is_zero());
 
     Object *ob = bh->ob;
     bh_remove(ob, bh);
@@ -1673,7 +1673,7 @@ loff_t ObjectCacher::release(Object *ob)
        p != ob->data.end();
        p++) {
     BufferHead *bh = p->second;
-    if (bh->is_clean()) 
+    if (bh->is_clean() || bh->is_zero())
       clean.push_back(bh);
     else 
       o_unclean += bh->length();
@@ -1811,7 +1811,7 @@ void ObjectCacher::verify_stats() const
 {
   ldout(cct, 10) << "verify_stats" << dendl;
 
-  loff_t clean = 0, dirty = 0, rx = 0, tx = 0, missing = 0, error = 0;
+  loff_t clean = 0, zero = 0, dirty = 0, rx = 0, tx = 0, missing = 0, error = 0;
   for (vector<hash_map<sobject_t, Object*> >::const_iterator i = objects.begin();
       i != objects.end();
       ++i) {
@@ -1830,6 +1830,9 @@ void ObjectCacher::verify_stats() const
         case BufferHead::STATE_CLEAN:
           clean += bh->length();
           break;
+        case BufferHead::STATE_ZERO:
+          zero += bh->length();
+          break;
         case BufferHead::STATE_DIRTY:
           dirty += bh->length();
           break;
@@ -1861,6 +1864,7 @@ void ObjectCacher::verify_stats() const
   assert(tx == stat_tx);
   assert(dirty == stat_dirty);
   assert(missing == stat_missing);
+  assert(zero == stat_zero);
   assert(error == stat_error);
 }
 
@@ -1873,6 +1877,9 @@ void ObjectCacher::bh_stat_add(BufferHead *bh)
   case BufferHead::STATE_CLEAN:
     stat_clean += bh->length();
     break;
+  case BufferHead::STATE_ZERO:
+    stat_zero += bh->length();
+    break;
   case BufferHead::STATE_DIRTY:
     stat_dirty += bh->length();
     bh->ob->dirty_or_tx += bh->length();
@@ -1905,6 +1912,9 @@ void ObjectCacher::bh_stat_sub(BufferHead *bh)
   case BufferHead::STATE_CLEAN:
     stat_clean -= bh->length();
     break;
+  case BufferHead::STATE_ZERO:
+    stat_zero -= bh->length();
+    break;
   case BufferHead::STATE_DIRTY:
     stat_dirty -= bh->length();
     bh->ob->dirty_or_tx -= bh->length();

diff --git a/src/osdc/ObjectCacher.h b/src/osdc/ObjectCacher.h
index efc672a62eaee34e418f8dff1b7e279ba66bf50a..baeb77f2d62765d779a1fc057d1038a9768c25ca 100644 (file)
--- a/src/osdc/ObjectCacher.h
+++ b/src/osdc/ObjectCacher.h
@@ -84,10 +84,11 @@ class ObjectCacher {
     // states
     static const int STATE_MISSING = 0;
     static const int STATE_CLEAN = 1;
-    static const int STATE_DIRTY = 2;
-    static const int STATE_RX = 3;
-    static const int STATE_TX = 4;
-    static const int STATE_ERROR = 5; // a read error occurred
+    static const int STATE_ZERO = 2;
+    static const int STATE_DIRTY = 3;
+    static const int STATE_RX = 4;
+    static const int STATE_TX = 5;
+    static const int STATE_ERROR = 6; // a read error occurred
 
   private:
     // my fields
@@ -136,6 +137,7 @@ class ObjectCacher {
     bool is_missing() { return state == STATE_MISSING; }
     bool is_dirty() { return state == STATE_DIRTY; }
     bool is_clean() { return state == STATE_CLEAN; }
+    bool is_zero() { return state == STATE_ZERO; }
     bool is_tx() { return state == STATE_TX; }
     bool is_rx() { return state == STATE_RX; }
     bool is_error() { return state == STATE_ERROR; }
@@ -370,6 +372,7 @@ class ObjectCacher {
   Cond  stat_cond;
 
   loff_t stat_clean;
+  loff_t stat_zero;
   loff_t stat_dirty;
   loff_t stat_rx;
   loff_t stat_tx;
@@ -386,6 +389,7 @@ class ObjectCacher {
   loff_t get_stat_dirty() { return stat_dirty; }
   loff_t get_stat_dirty_waiting() { return stat_dirty_waiting; }
   loff_t get_stat_clean() { return stat_clean; }
+  loff_t get_stat_zero() { return stat_zero; }
 
   void touch_bh(BufferHead *bh) {
     if (bh->is_dirty())
@@ -402,6 +406,7 @@ class ObjectCacher {
   
   void mark_missing(BufferHead *bh) { bh_set_state(bh, BufferHead::STATE_MISSING); };
   void mark_clean(BufferHead *bh) { bh_set_state(bh, BufferHead::STATE_CLEAN); };
+  void mark_zero(BufferHead *bh) { bh_set_state(bh, BufferHead::STATE_ZERO); };
   void mark_rx(BufferHead *bh) { bh_set_state(bh, BufferHead::STATE_RX); };
   void mark_tx(BufferHead *bh) { bh_set_state(bh, BufferHead::STATE_TX); };
   void mark_error(BufferHead *bh) { bh_set_state(bh, BufferHead::STATE_ERROR); };
@@ -633,6 +638,7 @@ inline ostream& operator<<(ostream& out, ObjectCacher::BufferHead &bh)
   if (bh.is_rx()) out << " rx";
   if (bh.is_dirty()) out << " dirty";
   if (bh.is_clean()) out << " clean";
+  if (bh.is_zero()) out << " zero";
   if (bh.is_missing()) out << " missing";
   if (bh.bl.length() > 0) out << " firstbyte=" << (int)bh.bl[0];
   if (bh.error) out << " error=" << bh.error;