From: Yehuda Sadeh <yehuda@inktank.com>
Date: Thu, 12 Sep 2013 05:30:12 +0000 (-0700)
Subject: rgw: don't call list::size() in ObjectCache
X-Git-Tag: v0.61.9~11
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=be2907ef85a31c2be8be7446fe71f5d2e1410ec0;p=ceph.git

rgw: don't call list::size() in ObjectCache

Fixes: #6286
Use an external counter instead of calling list::size()

Reviewed-by: Sage Weil <sage@inktank.com>
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
(cherry picked from commit 31e3a51e933429d286104fe077e98ea883437ad6)
---

diff --git a/src/rgw/rgw_cache.cc b/src/rgw/rgw_cache.cc
index 97a5e47d0f79..84f1f1352638 100644
--- a/src/rgw/rgw_cache.cc
+++ b/src/rgw/rgw_cache.cc
@@ -104,7 +104,7 @@ void ObjectCache::remove(string& name)
 
 void ObjectCache::touch_lru(string& name, std::list<string>::iterator& lru_iter)
 {
-  while (lru.size() > (size_t)cct->_conf->rgw_cache_lru_size) {
+  while (lru_size > (size_t)cct->_conf->rgw_cache_lru_size) {
     list<string>::iterator iter = lru.begin();
     if ((*iter).compare(name) == 0) {
       /*
@@ -118,10 +118,12 @@ void ObjectCache::touch_lru(string& name, std::list<string>::iterator& lru_iter)
     if (map_iter != cache_map.end())
       cache_map.erase(map_iter);
     lru.pop_front();
+    lru_size--;
   }
 
   if (lru_iter == lru.end()) {
     lru.push_back(name);
+    lru_size++;
     lru_iter--;
     ldout(cct, 10) << "adding " << name << " to cache LRU end" << dendl;
   } else {
@@ -139,6 +141,7 @@ void ObjectCache::remove_lru(string& name, std::list<string>::iterator& lru_iter
     return;
 
   lru.erase(lru_iter);
+  lru_size--;
   lru_iter = lru.end();
 }
 
diff --git a/src/rgw/rgw_cache.h b/src/rgw/rgw_cache.h
index 4de16384f1a2..e5f62b1f860c 100644
--- a/src/rgw/rgw_cache.h
+++ b/src/rgw/rgw_cache.h
@@ -126,13 +126,14 @@ struct ObjectCacheEntry {
 class ObjectCache {
   std::map<string, ObjectCacheEntry> cache_map;
   std::list<string> lru;
+  unsigned long lru_size;
   Mutex lock;
   CephContext *cct;
 
   void touch_lru(string& name, std::list<string>::iterator& lru_iter);
   void remove_lru(string& name, std::list<string>::iterator& lru_iter);
 public:
-  ObjectCache() : lock("ObjectCache"), cct(NULL) { }
+  ObjectCache() : lru_size(0), lock("ObjectCache"), cct(NULL) { }
   int get(std::string& name, ObjectCacheInfo& bl, uint32_t mask);
   void put(std::string& name, ObjectCacheInfo& bl);
   void remove(std::string& name);