]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Monitor.cc: use empty() instead of size()
authorDanny Al-Gaaf <danny.al-gaaf@bisect.de>
Wed, 13 Feb 2013 13:38:28 +0000 (14:38 +0100)
committerDanny Al-Gaaf <danny.al-gaaf@bisect.de>
Wed, 13 Feb 2013 13:38:28 +0000 (14:38 +0100)
Use empty() since it should be prefered as it has, following the
standard, a constant time complexity regardless of the containter
type. The same is not guaranteed for size().

warning from cppcheck was:
[src/mon/Monitor.cc:487]: (performance) Possible inefficient
  checking for 'initial_members' emptiness.
[src/mon/Monitor.cc:1361]: (performance) Possible inefficient
  checking for 'timecheck_skews' emptiness.
[src/mon/Monitor.cc:2302]: (performance) Possible inefficient
  checking for 'timecheck_waiting' emptiness.
[src/mon/Monitor.cc:2547]: (performance) Possible inefficient
  checking for 'timecheck_waiting' emptiness.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
src/mon/Monitor.cc

index 699db8968f175eec188d04b4e581cc2910a73a7b..1b8bc9ebeb78a3df6848ebaf16b917363e7894f8 100644 (file)
@@ -484,7 +484,7 @@ int Monitor::preinit()
     list<string> initial_members;
     get_str_list(g_conf->mon_initial_members, initial_members);
 
-    if (initial_members.size()) {
+    if (!initial_members.empty()) {
       dout(1) << " initial_members " << initial_members << ", filtering seed monmap" << dendl;
 
       monmap->set_initial_members(g_ceph_context, initial_members, name, messenger->get_myaddr(),
@@ -1358,7 +1358,7 @@ void Monitor::get_health(string& status, bufferlist *detailbl, Formatter *f)
       << (timecheck_round%2 ? "on-going" : "finished");
   }
 
-  if (timecheck_skews.size() != 0) {
+  if (!timecheck_skews.empty()) {
     list<string> warns;
     if (f)
       f->open_array_section("mons");
@@ -2299,7 +2299,7 @@ void Monitor::timecheck_finish_round(bool success)
   timecheck_round_start = utime_t();
 
   if (success) {
-    assert(timecheck_waiting.size() == 0);
+    assert(timecheck_waiting.empty());
     assert(timecheck_acks == quorum.size());
     timecheck_report();
     return;
@@ -2544,7 +2544,7 @@ void Monitor::handle_timecheck_leader(MTimeCheck *m)
     dout(10) << __func__ << " got pongs from everybody ("
              << timecheck_acks << " total)" << dendl;
     assert(timecheck_skews.size() == timecheck_acks);
-    assert(timecheck_waiting.size() == 0);
+    assert(timecheck_waiting.empty());
     // everyone has acked, so bump the round to finish it.
     timecheck_finish_round();
   }