Merge pull request ceph#62 from dalgaaf/wip-da-sca-cppcheck-performan…

…ce-3 More performance patches Reviewed-by: Sage Weil <[email protected]>
dano · Feb 16, 2013 · c45fbc7 · c45fbc7
2 parents ae0c2bb + 29b4466
commit c45fbc7
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/src/ceph_authtool.cc b/src/ceph_authtool.cc
@@ -121,7 +121,7 @@ int main(int argc, const char **argv)
 	!add_key.empty() ||
 	list ||
 	!caps_fn.empty() ||
-	caps.size() ||
+	!caps.empty() ||
 	set_auid ||
 	print_key ||
 	create_keyring ||
@@ -234,7 +234,7 @@ int main(int argc, const char **argv)
     keyring.set_caps(ename, caps);
     modified = true;
   }
-  if (caps.size()) {
+  if (!caps.empty()) {
     keyring.set_caps(ename, caps);
     modified = true;
   }

diff --git a/src/client/Client.cc b/src/client/Client.cc
@@ -3646,7 +3646,7 @@ void Client::unmount()
   }
 
   // wait for sessions to close
-  while (mds_sessions.size()) {
+  while (!mds_sessions.empty()) {
     ldout(cct, 2) << "waiting for " << mds_sessions.size() << " mds sessions to close" << dendl;
     mount_cond.Wait(client_lock);
   }
@@ -7486,7 +7486,7 @@ int Client::get_file_stripe_address(int fd, loff_t offset, vector<entity_addr_t>
   pg_t pg = osdmap->object_locator_to_pg(extents[0].oid, extents[0].oloc);
   vector<int> osds;
   osdmap->pg_to_acting_osds(pg, osds);
-  if (!osds.size())
+  if (osds.empty())
     return -EINVAL;
 
   for (unsigned i = 0; i < osds.size(); i++) {

diff --git a/src/client/SyntheticClient.cc b/src/client/SyntheticClient.cc
@@ -2703,7 +2703,7 @@ int SyntheticClient::random_walk(int num_req)
     }
 
     // descend?
-    if (.9*roll_die(::pow((double).9,(double)cwd.depth())) && subdirs.size()) {
+    if (.9*roll_die(::pow((double).9,(double)cwd.depth())) && !subdirs.empty()) {
       string s = get_random_subdir();
       cwd.push_dentry( s );
       dout(DBL) << "cd " << s << " -> " << cwd << dendl;

diff --git a/src/cls/lock/cls_lock.cc b/src/cls/lock/cls_lock.cc
@@ -206,7 +206,7 @@ static int lock_obj(cls_method_context_t hctx,
     }
   }
 
-  if (lockers.size()) {
+  if (!lockers.empty()) {
     if (exclusive) {
       CLS_LOG(20, "could not exclusive-lock object, already locked");
       return -EBUSY;

diff --git a/src/mds/CDentry.h b/src/mds/CDentry.h
@@ -231,7 +231,7 @@ class CDentry : public MDSCacheObject, public LRUObject {
   bool is_projected() { return projected.size(); }
 
   linkage_t *get_projected_linkage() {
-    if (projected.size())
+    if (!projected.empty())
       return &projected.back();
     return &linkage;
   }

diff --git a/src/mds/MDSMap.h b/src/mds/MDSMap.h
@@ -455,7 +455,7 @@ class MDSMap {
       failed.empty();
   }
   bool is_stopped() {
-    return up.size() == 0;
+    return up.empty();
   }
 
   // inst