xlist: clean up interface

diff --git a/src/include/xlist.h b/src/include/xlist.h
index ca0d6e4153bbd33f2f94eba3cce05b52796a5f64..c763a4a3a28522382b7f7c36653a8aacd50693be 100644 (file)
--- a/src/include/xlist.h
+++ b/src/include/xlist.h
@@ -25,7 +25,7 @@ public:
     
     item(T i) : _item(i), _prev(0), _next(0), _list(0) {}
     ~item() { 
-      assert(!is_on_xlist());
+      assert(!is_on_list());
       //remove_myself();
     }
     // no copying!
@@ -33,8 +33,8 @@ public:
     const item& operator= (const item& right);
 
     
-    xlist* get_xlist() { return _list; }
-    bool is_on_xlist() { return _list ? true:false; }
+    xlist* get_list() { return _list; }
+    bool is_on_list() { return _list ? true:false; }
     bool remove_myself() {
       if (_list) {
        _list->remove(this);

diff --git a/src/mds/Locker.cc b/src/mds/Locker.cc
index 27cbd2da7ea4e51b1e44d15772d38c5a3b79339e..5733a5d4e71b5a3857bbc99287f4626483fdb00f 100644 (file)
--- a/src/mds/Locker.cc
+++ b/src/mds/Locker.cc
@@ -2912,7 +2912,7 @@ void Locker::scatter_eval(ScatterLock *lock, bool *need_issue)
 void Locker::mark_updated_scatterlock(ScatterLock *lock)
 {
   lock->mark_dirty();
-  if (lock->get_updated_item()->is_on_xlist()) {
+  if (lock->get_updated_item()->is_on_list()) {
     dout(10) << "mark_updated_scatterlock " << *lock
             << " - already on list since " << lock->get_update_stamp() << dendl;
   } else {

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index 3611f17cb93400726abf413c66d5f01ce9dee877..eb1727dd23303e9ee6f36efe0689c21c41e33d16 100644 (file)
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -1306,7 +1306,7 @@ CInode *MDCache::cow_inode(CInode *in, snapid_t last)
       // clone to oldin
       client_t client = p->first;
       Capability *newcap = oldin->add_client_cap(client, 0, in->containing_realm);
-      cap->session_caps_item.get_xlist()->push_back(&newcap->session_caps_item);
+      cap->session_caps_item.get_list()->push_back(&newcap->session_caps_item);
       newcap->issue(cap->issued());
       newcap->set_last_issue_stamp(cap->get_last_issue_stamp());
       newcap->client_follows = cap->client_follows;

diff --git a/src/mds/ScatterLock.h b/src/mds/ScatterLock.h
index fce5b1e90798eff1bd67c8c2bcc75d9d0243e50b..50eb647cc31c5f5f06fba9c62d9727eee2aad445 100644 (file)
--- a/src/mds/ScatterLock.h
+++ b/src/mds/ScatterLock.h
@@ -35,7 +35,7 @@ class ScatterLock : public SimpleLock {
       return dirty == false &&
        flushing == false &&
        scatter_wanted == false &&
-       !xlistitem_updated.is_on_xlist();
+       !xlistitem_updated.is_on_list();
     }
   };
   more_bits_t *_more;

diff --git a/src/mds/SessionMap.h b/src/mds/SessionMap.h
index 09cbc690f203df085c07eafbfdda2a929d109512..2a99a631dc20021d2a10fb5f07f924a3d02293ad 100644 (file)
--- a/src/mds/SessionMap.h
+++ b/src/mds/SessionMap.h
@@ -161,7 +161,7 @@ public:
     requests(0),  // member_offset passed to front() manually
     cap_push_seq(0) { }
   ~Session() {
-    assert(!session_list_item.is_on_xlist());
+    assert(!session_list_item.is_on_list());
   }
 
   void clear() {
@@ -251,7 +251,7 @@ public:
     s->put();
   }
   void touch_session(Session *session) {
-    if (session->session_list_item.is_on_xlist()) {
+    if (session->session_list_item.is_on_list()) {
       by_state[session->state].push_back(&session->session_list_item);
       session->last_cap_renew = g_clock.now();
     } else {

diff --git a/src/mon/Session.h b/src/mon/Session.h
index ddcb7e106aebf0aa5f02321892eb60068f2234ff..57b7addb38c75aa156ce4fde09cea53d51bc4363 100644 (file)
--- a/src/mon/Session.h
+++ b/src/mon/Session.h
@@ -53,7 +53,7 @@ struct Session : public RefCountedObject {
   ~Session() {
     generic_dout(0) << "~Session " << this << dendl;
     // we should have been removed before we get destructed; see SessionMap::remove_session()
-    assert(!item.is_on_xlist());
+    assert(!item.is_on_list());
     assert(sub_map.empty());
     delete auth_handler;
   }

diff --git a/src/msg/SimpleMessenger.cc b/src/msg/SimpleMessenger.cc
index 0daa2f301c665c47964017c85c7310966b711bc9..a907f4127198936f8e20b286270ff36fa01071e6 100644 (file)
--- a/src/msg/SimpleMessenger.cc
+++ b/src/msg/SimpleMessenger.cc
@@ -1263,7 +1263,7 @@ void SimpleMessenger::Pipe::discard_queue()
   for (map<int, xlist<Pipe *>::item* >::iterator i = queue_items.begin();
        i != queue_items.end();
        ++i) {
-    if ((list_on = i->second->get_xlist())) { //if in round-robin
+    if ((list_on = i->second->get_list())) { //if in round-robin
       i->second->remove_myself(); //take off
       if (list_on->empty()) //if round-robin queue is empty
        q.queued_pipes.erase(i->first); //remove from map

diff --git a/src/msg/SimpleMessenger.h b/src/msg/SimpleMessenger.h
index 38799a4cb0f7ae4bb7a5c7a2228bb141c073ab05..43a7394524b3540b337b4c00bd571b4e6b449d8f 100644 (file)
--- a/src/msg/SimpleMessenger.h
+++ b/src/msg/SimpleMessenger.h
@@ -188,7 +188,7 @@ private:
       for (map<int, xlist<Pipe *>::item* >::iterator i = queue_items.begin();
           i != queue_items.end();
           ++i) {
-       if (i->second->is_on_xlist())
+       if (i->second->is_on_list())
          i->second->remove_myself();
        delete i->second;
       }

diff --git a/src/osd/OSD.h b/src/osd/OSD.h
index 83c27e7bb78d35869f5b162a92ac38c0efa4098a..984a497c66b397b4aa73124edd0ab6023b7ee79e 100644 (file)
--- a/src/osd/OSD.h
+++ b/src/osd/OSD.h
@@ -550,7 +550,7 @@ protected:
 
   void pg_stat_queue_enqueue(PG *pg) {
     pg_stat_queue_lock.Lock();
-    if (pg->is_primary() && !pg->stat_queue_item.is_on_xlist()) {
+    if (pg->is_primary() && !pg->stat_queue_item.is_on_list()) {
       pg->get();
       pg_stat_queue.push_back(&pg->stat_queue_item);
     }
@@ -627,7 +627,7 @@ protected:
       return osd->backlog_queue.empty();
     }
     bool _enqueue(PG *pg) {
-      if (!pg->backlog_item.is_on_xlist()) {
+      if (!pg->backlog_item.is_on_list()) {
        pg->get();
        osd->backlog_queue.push_back(&pg->backlog_item);
        return true;
@@ -678,7 +678,7 @@ protected:
       return osd->recovery_queue.empty();
     }
     bool _enqueue(PG *pg) {
-      if (!pg->recovery_item.is_on_xlist()) {
+      if (!pg->recovery_item.is_on_list()) {
        pg->get();
        osd->recovery_queue.push_back(&pg->recovery_item);
 
@@ -752,7 +752,7 @@ protected:
       return osd->snap_trim_queue.empty();
     }
     bool _enqueue(PG *pg) {
-      if (pg->snap_trim_item.is_on_xlist())
+      if (pg->snap_trim_item.is_on_list())
        return false;
       osd->snap_trim_queue.push_back(&pg->snap_trim_item);
       return true;
@@ -787,7 +787,7 @@ protected:
       return osd->scrub_queue.empty();
     }
     bool _enqueue(PG *pg) {
-      if (pg->scrub_item.is_on_xlist())
+      if (pg->scrub_item.is_on_list())
        return false;
       pg->get();
       osd->scrub_queue.push_back(&pg->scrub_item);
@@ -828,7 +828,7 @@ protected:
       return osd->remove_queue.empty();
     }
     bool _enqueue(PG *pg) {
-      if (pg->remove_item.is_on_xlist())
+      if (pg->remove_item.is_on_list())
        return false;
       pg->get();
       osd->remove_queue.push_back(&pg->remove_item);

diff --git a/src/osdc/ObjectCacher.h b/src/osdc/ObjectCacher.h
index f9c93cde7724df1318a197a47b94dfed384081eb..c4e5c592bc1bfb128558053f4ddd2e5c6eb0c4d1 100644 (file)
--- a/src/osdc/ObjectCacher.h
+++ b/src/osdc/ObjectCacher.h
@@ -195,7 +195,7 @@ class ObjectCacher {
       return data.empty() && lock_state == LOCK_NONE &&
         waitfor_ack.empty() && waitfor_commit.empty() &&
         waitfor_rd.empty() && waitfor_wr.empty() &&
-       !uncommitted_item.is_on_xlist();
+       !uncommitted_item.is_on_list();
     }
 
     // bh