Merge pull request #113 from dalgaaf/wip-da-performance-3

Iterator related fixes

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

23 files changed, 37 insertions, 36 deletions

diff --git a/src/auth/AuthMethodList.cc b/src/auth/AuthMethodList.cc
index e345e150549..50d58bff4d4 100644
--- a/src/auth/AuthMethodList.cc
+++ b/src/auth/AuthMethodList.cc
@@ -59,8 +59,10 @@ int AuthMethodList::pick(const std::set<__u32>& supported)
 
 void AuthMethodList::remove_supported_auth(int auth_type)
 {
-  for (list<__u32>::iterator p = auth_supported.begin(); p != auth_supported.end(); ++p) {
+  for (list<__u32>::iterator p = auth_supported.begin(); p != auth_supported.end(); ) {
     if (*p == (__u32)auth_type)
       auth_supported.erase(p++);
+    else 
+      ++p;
   }
 }
diff --git a/src/client/Client.cc b/src/client/Client.cc
index 22f4a8b76db..e4ff7e42b76 100644
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -3716,7 +3716,7 @@ void Client::unmount()
          p != inode_map.end(); 
          p = next) {
       next = p;
-      next++;
+      ++next;
       Inode *in = p->second;
       if (!in) {
 	ldout(cct, 0) << "null inode_map entry ino " << p->first << dendl;
@@ -6480,7 +6480,7 @@ void Client::_ll_drop_pins()
        it = next) {
     Inode *in = it->second;
     next = it;
-    next++;
+    ++next;
     if (in->ll_ref)
       _ll_put(in, in->ll_ref);
   }
diff --git a/src/mds/CInode.cc b/src/mds/CInode.cc
index 21f5e166ac0..2744bfa4090 100644
--- a/src/mds/CInode.cc
+++ b/src/mds/CInode.cc
@@ -1021,7 +1021,7 @@ void CInode::build_backtrace(int64_t location, inode_backtrace_t* bt)
     if (*i == location)
       continue;
     bt->old_pools.insert(*i);
-    i++;
+    ++i;
   }
 }
 
diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index 554ade6465c..43cf4b0d9bf 100644
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -8456,7 +8456,7 @@ void MDCache::_purge_forwarding_pointers(inode_backtrace_t *backtrace, CDentry *
   // remove all the objects with forwarding pointer backtraces (aka sentinels)
   for (set<int64_t>::const_iterator i = backtrace->old_pools.begin();
        i != backtrace->old_pools.end();
-       i++) {
+       ++i) {
     SnapContext snapc;
     object_t oid = CInode::get_object_name(backtrace->ino, frag_t(), "");
     object_locator_t oloc(*i);
diff --git a/src/mds/mdstypes.h b/src/mds/mdstypes.h
index c7d678699ab..cf5c1a7f5cb 100644
--- a/src/mds/mdstypes.h
+++ b/src/mds/mdstypes.h
@@ -1250,7 +1250,7 @@ protected:
     map<int, int>::iterator it = ref_map.begin();
     while (it != ref_map.end()) {
       out << " " << pin_name(it->first) << "=" << it->second;
-      it++;
+      ++it;
     }
 #else
     out << " nref=" << ref;
diff --git a/src/mon/Session.h b/src/mon/Session.h
index 9fc492a7613..5a2437d2de6 100644
--- a/src/mon/Session.h
+++ b/src/mon/Session.h
@@ -101,7 +101,7 @@ struct MonSessionMap {
     if (s->inst.name.is_osd()) {
       for (multimap<int,MonSession*>::iterator p = by_osd.find(s->inst.name.num());
 	   p->first == s->inst.name.num();
-	   p++)
+	   ++p)
 	if (p->second == s) {
 	  by_osd.erase(p);
 	  break;
diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc
index 2d3dc227215..28cc6a73f64 100644
--- a/src/osd/OSDMap.cc
+++ b/src/osd/OSDMap.cc
@@ -889,7 +889,7 @@ int OSDMap::apply_incremental(const Incremental &inc)
     osd_info[i->first].up_thru = i->second;
   for (map<int32_t,pair<epoch_t,epoch_t> >::const_iterator i = inc.new_last_clean_interval.begin();
        i != inc.new_last_clean_interval.end();
-       i++) {
+       ++i) {
     osd_info[i->first].last_clean_begin = i->second.first;
     osd_info[i->first].last_clean_end = i->second.second;
   }
diff --git a/src/rgw/rgw_rest_swift.cc b/src/rgw/rgw_rest_swift.cc
index 06f9f835b60..31f92af1de2 100644
--- a/src/rgw/rgw_rest_swift.cc
+++ b/src/rgw/rgw_rest_swift.cc
@@ -123,7 +123,7 @@ void RGWListBucket_ObjStore_SWIFT::send_response()
       do_pref = true;
     else if (iter->name.compare(pref_iter->first) == 0) {
       do_objs = true;
-      pref_iter++;
+      ++pref_iter;
     } else if (iter->name.compare(pref_iter->first) <= 0)
       do_objs = true;
     else
@@ -172,9 +172,9 @@ void RGWListBucket_ObjStore_SWIFT::send_response()
     }
 next:
     if (do_objs)
-      iter++;
+      ++iter;
     else
-      pref_iter++;
+      ++pref_iter;
   }
 
   s->formatter->close_section();
diff --git a/src/rgw/rgw_user.cc b/src/rgw/rgw_user.cc
index f01b5c21dbb..5602fd4345d 100644
--- a/src/rgw/rgw_user.cc
+++ b/src/rgw/rgw_user.cc
@@ -246,7 +246,7 @@ int rgw_read_user_buckets(RGWRados *store, string user_id, RGWUserBuckets& bucke
     if (ret < 0)
       return ret;
 
-    for (map<string,bufferlist>::iterator q = m.begin(); q != m.end(); q++) {
+    for (map<string,bufferlist>::iterator q = m.begin(); q != m.end(); ++q) {
       bufferlist::iterator iter = q->second.begin();
       RGWBucketEnt bucket;
       ::decode(bucket, iter);
diff --git a/src/test/ObjectMap/test_object_map.cc b/src/test/ObjectMap/test_object_map.cc
index 172cb2e881a..4365ff65b23 100644
--- a/src/test/ObjectMap/test_object_map.cc
+++ b/src/test/ObjectMap/test_object_map.cc
@@ -28,7 +28,7 @@ typename T::iterator rand_choose(T &cont) {
   int index = rand() % cont.size();
   typename T::iterator retval = cont.begin();
 
-  for (; index > 0; --index) retval++;
+  for (; index > 0; --index) ++retval;
   return retval;
 }
 
diff --git a/src/test/bench/bencher.h b/src/test/bench/bencher.h
index 9f48835a5d3..6660d1dfa62 100644
--- a/src/test/bench/bencher.h
+++ b/src/test/bench/bencher.h
@@ -137,7 +137,7 @@ public:
     cur_pos += length;
     if (cur_pos > size) {
       cur_pos = 0;
-      object_pos++;
+      ++object_pos;
     }
     if (object_pos == objects.end())
       object_pos = objects.begin();
diff --git a/src/test/encoding/ceph_dencoder.cc b/src/test/encoding/ceph_dencoder.cc
index fe4acb9b46f..b98edcb61ee 100644
--- a/src/test/encoding/ceph_dencoder.cc
+++ b/src/test/encoding/ceph_dencoder.cc
@@ -238,7 +238,7 @@ int main(int argc, const char **argv)
 	cout << p->first << std::endl;
       exit(0);
     } else if (*i == string("type")) {
-      i++;
+      ++i;
       if (i == args.end()) {
 	usage(cerr);
 	exit(1);
@@ -254,7 +254,7 @@ int main(int argc, const char **argv)
       cout << CEPH_FEATURES_SUPPORTED_DEFAULT << std::endl;
       exit(0);
     } else if (*i == string("set_features")) {
-      i++;
+      ++i;
       if (i == args.end()) {
 	usage(cerr);
 	exit(1);
@@ -289,14 +289,14 @@ int main(int argc, const char **argv)
       cout << std::endl;
 
     } else if (*i == string("import")) {
-      i++;
+      ++i;
       if (i == args.end()) {
 	usage(cerr);
 	exit(1);
       }
       encbl.read_file(*i, &err);
     } else if (*i == string("export")) {
-      i++;
+      ++i;
       if (i == args.end()) {
 	usage(cerr);
 	exit(1);
@@ -326,7 +326,7 @@ int main(int argc, const char **argv)
 	usage(cerr);
 	exit(1);
       }
-      i++;
+      ++i;
       if (i == args.end()) {
 	usage(cerr);
 	exit(1);
diff --git a/src/test/filestore/TestFileStoreState.cc b/src/test/filestore/TestFileStoreState.cc
index 631d5294d9a..c786f87f268 100644
--- a/src/test/filestore/TestFileStoreState.cc
+++ b/src/test/filestore/TestFileStoreState.cc
@@ -147,7 +147,7 @@ TestFileStoreState::coll_entry_t::~coll_entry_t()
 {
   if (m_objects.size() > 0) {
     map<int, hobject_t*>::iterator it = m_objects.begin();
-    for (; it != m_objects.end(); it++) {
+    for (; it != m_objects.end(); ++it) {
       hobject_t *obj = it->second;
       if (obj) {
         delete obj;
@@ -237,7 +237,7 @@ hobject_t *TestFileStoreState::coll_entry_t::get_obj_at(int pos,
 
   hobject_t *ret = NULL;
   map<int, hobject_t*>::iterator it = m_objects.begin();
-  for (int i = 0; it != m_objects.end(); it++, i++) {
+  for (int i = 0; it != m_objects.end(); ++it, i++) {
     if (i == pos) {
       ret = it->second;
       break;
diff --git a/src/test/filestore/TestFileStoreState.h b/src/test/filestore/TestFileStoreState.h
index 74276b03f70..d3bba692437 100644
--- a/src/test/filestore/TestFileStoreState.h
+++ b/src/test/filestore/TestFileStoreState.h
@@ -99,10 +99,10 @@ public:
   }
   ~TestFileStoreState() { 
     map<int, coll_entry_t*>::iterator it = m_collections.begin();
-    for (; it != m_collections.end(); it++) {
-	if (it->second)
-	    delete it->second;
-	m_collections.erase(it);
+    while (it != m_collections.end()) {
+      if (it->second)
+	delete it->second;
+      m_collections.erase(it++);
     }
   }
 
diff --git a/src/test/filestore/test_idempotent.cc b/src/test/filestore/test_idempotent.cc
index 9feba3f9f6a..6be706d97b6 100644
--- a/src/test/filestore/test_idempotent.cc
+++ b/src/test/filestore/test_idempotent.cc
@@ -38,7 +38,7 @@ typename T::iterator rand_choose(T &cont) {
   int index = rand() % cont.size();
   typename T::iterator retval = cont.begin();
 
-  for (; index > 0; --index) retval++;
+  for (; index > 0; --index) ++retval;
   return retval;
 }
 
diff --git a/src/test/filestore/workload_generator.cc b/src/test/filestore/workload_generator.cc
index 5d7b8139da4..496379d7ad1 100644
--- a/src/test/filestore/workload_generator.cc
+++ b/src/test/filestore/workload_generator.cc
@@ -349,8 +349,7 @@ void WorkloadGenerator::do_destroy_collection(ObjectStore::Transaction *t,
   dout(2) << __func__ << " coll " << entry->m_coll
       << " (" << ls.size() << " objects)" << dendl;
 
-  vector<hobject_t>::iterator it;
-  for (it = ls.begin(); it < ls.end(); it++) {
+  for (vector<hobject_t>::iterator it = ls.begin(); it < ls.end(); ++it) {
     t->remove(entry->m_coll, *it);
   }
 
diff --git a/src/test/osd/Object.cc b/src/test/osd/Object.cc
index 3ff1eb9bb2d..408cc63ac02 100644
--- a/src/test/osd/Object.cc
+++ b/src/test/osd/Object.cc
@@ -90,7 +90,7 @@ ObjectDesc::iterator &ObjectDesc::iterator::advance(bool init) {
   while (pos == limit) {
     limit = *stack.begin();
     stack.pop_front();
-    cur_cont--;
+    --cur_cont;
   }
 
   if (cur_cont == obj.layers.end()) {
@@ -110,7 +110,7 @@ ObjectDesc::iterator &ObjectDesc::iterator::advance(bool init) {
     if (next < limit) {
       limit = next;
     }
-    cur_cont++;
+    ++cur_cont;
     if (cur_cont == obj.layers.end()) {
       break;
     }
diff --git a/src/test/osd/RadosModel.h b/src/test/osd/RadosModel.h
index c74d627e0fc..b022d24dc91 100644
--- a/src/test/osd/RadosModel.h
+++ b/src/test/osd/RadosModel.h
@@ -34,7 +34,7 @@ typename T::iterator rand_choose(T &cont) {
   int index = rand() % cont.size();
   typename T::iterator retval = cont.begin();
 
-  for (; index > 0; --index) retval++;
+  for (; index > 0; --index) ++retval;
   return retval;
 }
 
diff --git a/src/test/test_snap_mapper.cc b/src/test/test_snap_mapper.cc
index db58c685b11..a3b250052ef 100644
--- a/src/test/test_snap_mapper.cc
+++ b/src/test/test_snap_mapper.cc
@@ -25,7 +25,7 @@ typename T::iterator rand_choose(T &cont) {
   int index = rand() % cont.size();
   typename T::iterator retval = cont.begin();
 
-  for (; index > 0; --index) retval++;
+  for (; index > 0; --index) ++retval;
   return retval;
 }
 
diff --git a/src/test/xattr_bench.cc b/src/test/xattr_bench.cc
index d212f55b65c..2baaee82ccb 100644
--- a/src/test/xattr_bench.cc
+++ b/src/test/xattr_bench.cc
@@ -46,7 +46,7 @@ typename T::iterator rand_choose(T &cont) {
   int index = rand() % cont.size();
   typename T::iterator retval = cont.begin();
 
-  for (; index > 0; --index) retval++;
+  for (; index > 0; --index) ++retval;
   return retval;
 }
 
diff --git a/src/tools/ceph-filestore-dump.cc b/src/tools/ceph-filestore-dump.cc
index fbd227dc25f..3f0fc497958 100644
--- a/src/tools/ceph-filestore-dump.cc
+++ b/src/tools/ceph-filestore-dump.cc
@@ -187,7 +187,7 @@ int main(int argc, char **argv)
 
   for (vector<coll_t>::iterator it = ls.begin();
        it != ls.end();
-       it++) {
+       ++it) {
     coll_t coll = *it;
     pg_t pgid;
     snapid_t snap;
diff --git a/src/tools/common.cc b/src/tools/common.cc
index 514d33d902f..8b1ed8f400b 100644
--- a/src/tools/common.cc
+++ b/src/tools/common.cc
@@ -540,7 +540,7 @@ void Subscriptions::handle_log(MLog *m)
   last_known_version = m->version;
 
   std::deque<LogEntry>::iterator it = m->entries.begin();
-  for (; it != m->entries.end(); it++) {
+  for (; it != m->entries.end(); ++it) {
     LogEntry e = *it;
     cout << e.stamp << " " << e.who.name 
 	 << " " << e.type << " " << e.msg << std::endl;
diff --git a/src/tools/rest_bench.cc b/src/tools/rest_bench.cc
index 939b503c8ee..3b82cbc8338 100644
--- a/src/tools/rest_bench.cc
+++ b/src/tools/rest_bench.cc
@@ -726,7 +726,7 @@ int main(int argc, const char **argv)
     } else {
       if (val[0] == '-')
         usage_exit();
-      i++;
+      ++i;
     }
   }