From 718d6468e270fbafe92ada7bad6203f5401617e0 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 12 Mar 2010 15:28:27 -0800 Subject: [PATCH] xlist: clean up interface --- src/include/xlist.h | 6 +++--- src/mds/Locker.cc | 2 +- src/mds/MDCache.cc | 2 +- src/mds/ScatterLock.h | 2 +- src/mds/SessionMap.h | 4 ++-- src/mon/Session.h | 2 +- src/msg/SimpleMessenger.cc | 2 +- src/msg/SimpleMessenger.h | 2 +- src/osd/OSD.h | 12 ++++++------ src/osdc/ObjectCacher.h | 2 +- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/include/xlist.h b/src/include/xlist.h index ca0d6e4153bbd..c763a4a3a2852 100644 --- 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 27cbd2da7ea4e..5733a5d4e71b5 100644 --- 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 3611f17cb9340..eb1727dd23303 100644 --- 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 fce5b1e90798e..50eb647cc31c5 100644 --- 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 09cbc690f203d..2a99a631dc200 100644 --- 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 ddcb7e106aebf..57b7addb38c75 100644 --- 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 0daa2f301c665..a907f41271989 100644 --- a/src/msg/SimpleMessenger.cc +++ b/src/msg/SimpleMessenger.cc @@ -1263,7 +1263,7 @@ void SimpleMessenger::Pipe::discard_queue() for (map::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 38799a4cb0f7a..43a7394524b35 100644 --- a/src/msg/SimpleMessenger.h +++ b/src/msg/SimpleMessenger.h @@ -188,7 +188,7 @@ private: for (map::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 83c27e7bb78d3..984a497c66b39 100644 --- 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 f9c93cde7724d..c4e5c592bc1bf 100644 --- 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 -- 2.39.5