atomic: rename test() -> read()

Make the interface slightly less weird.

diff --git a/src/common/Thread.h b/src/common/Thread.h
index 0950cd57fbcc9efe6328d54829f4105091df1355..c65804462a3a3e92b22e070599276088bdb66029 100644 (file)
--- a/src/common/Thread.h
+++ b/src/common/Thread.h
@@ -46,7 +46,7 @@ class Thread {
   bool is_started() { return thread_id != 0; }
   bool am_self() { return (pthread_self() == thread_id); }
 
-  static int get_num_threads() { return _num_threads.test(); }
+  static int get_num_threads() { return _num_threads.read(); }
 
   int kill(int signal) {
     if (thread_id)

diff --git a/src/include/atomic.h b/src/include/atomic.h
index 3a23170905baf1be967bc3c83182c5fd4a1de800..9145aeb9e64795e454226514d6996be95bfbf2a0 100644 (file)
--- a/src/include/atomic.h
+++ b/src/include/atomic.h
@@ -72,7 +72,7 @@ public:
     nref -= d;
     lock.unlock();
   }
-  int test() const {
+  int read() const {
     return nref;
   }
 };

diff --git a/src/include/buffer.h b/src/include/buffer.h
index 63f4d181a202b0848c0809dd4b2a20cb2501e6aa..4cb888d20233b01e6552bd40adf4dd56b50720a3 100644 (file)
--- a/src/include/buffer.h
+++ b/src/include/buffer.h
@@ -156,16 +156,16 @@ private:
       else
        data = 0;
       inc_total_alloc(len);
-      bdout << "raw_char alloc " << (void *)data << " " << l << " " << buffer_total_alloc.test() << bendl;
+      bdout << "raw_char alloc " << (void *)data << " " << l << " " << buffer_total_alloc.read() << bendl;
     }
     raw_char(unsigned l, char *b) : raw(b, l) {
       inc_total_alloc(len);
-      bdout << "raw_char alloc " << (void *)data << " " << l << " " << buffer_total_alloc.test() << bendl;
+      bdout << "raw_char alloc " << (void *)data << " " << l << " " << buffer_total_alloc.read() << bendl;
     }
     ~raw_char() {
       delete[] data;
       dec_total_alloc(len);      
-      bdout << "raw_char free " << (void *)data << " " << buffer_total_alloc.test() << bendl;
+      bdout << "raw_char free " << (void *)data << " " << buffer_total_alloc.read() << bendl;
     }
     raw* clone_empty() {
       return new raw_char(len);
@@ -180,16 +180,16 @@ private:
       else
        data = 0;
       inc_total_alloc(len);
-      bdout << "raw_malloc alloc " << (void *)data << " " << l << " " << buffer_total_alloc.test() << bendl;
+      bdout << "raw_malloc alloc " << (void *)data << " " << l << " " << buffer_total_alloc.read() << bendl;
     }
     raw_malloc(unsigned l, char *b) : raw(b, l) {
       inc_total_alloc(len);
-      bdout << "raw_malloc alloc " << (void *)data << " " << l << " " << buffer_total_alloc.test() << bendl;
+      bdout << "raw_malloc alloc " << (void *)data << " " << l << " " << buffer_total_alloc.read() << bendl;
     }
     ~raw_malloc() {
       free(data);
       dec_total_alloc(len);      
-      bdout << "raw_malloc free " << (void *)data << " " << buffer_total_alloc.test() << bendl;
+      bdout << "raw_malloc free " << (void *)data << " " << buffer_total_alloc.read() << bendl;
     }
     raw* clone_empty() {
       return new raw_malloc(len);
@@ -213,12 +213,12 @@ private:
       if (!data)
        throw new bad_alloc;
       inc_total_alloc(len);
-      bdout << "raw_mmap alloc " << (void *)data << " " << l << " " << buffer_total_alloc.test() << bendl;
+      bdout << "raw_mmap alloc " << (void *)data << " " << l << " " << buffer_total_alloc.read() << bendl;
     }
     ~raw_mmap_pages() {
       ::munmap(data, len);
       dec_total_alloc(len);
-      bdout << "raw_mmap free " << (void *)data << " " << buffer_total_alloc.test() << bendl;
+      bdout << "raw_mmap free " << (void *)data << " " << buffer_total_alloc.read() << bendl;
     }
     raw* clone_empty() {
       return new raw_mmap_pages(len);
@@ -239,12 +239,12 @@ private:
       if (!data)
        throw new bad_alloc;
       inc_total_alloc(len);
-      bdout << "raw_posix_aligned alloc " << (void *)data << " " << l << " " << buffer_total_alloc.test() << bendl;
+      bdout << "raw_posix_aligned alloc " << (void *)data << " " << l << " " << buffer_total_alloc.read() << bendl;
     }
     ~raw_posix_aligned() {
       ::free((void*)data);
       dec_total_alloc(len);
-      bdout << "raw_posix_aligned free " << (void *)data << " " << buffer_total_alloc.test() << bendl;
+      bdout << "raw_posix_aligned free " << (void *)data << " " << buffer_total_alloc.read() << bendl;
     }
     raw* clone_empty() {
       return new raw_posix_aligned(len);
@@ -377,7 +377,7 @@ public:
       _raw = newraw;
     }
     bool do_cow() {
-      if (_raw->nref.test() > 1) {
+      if (_raw->nref.read() > 1) {
        //std::cout << "doing cow on " << _raw << " len " << _len << std::endl;
        clone_in_place();
        return true;
@@ -441,7 +441,7 @@ public:
 
     const char *raw_c_str() const { assert(_raw); return _raw->data; }
     unsigned raw_length() const { assert(_raw); return _raw->len; }
-    int raw_nref() const { assert(_raw); return _raw->nref.test(); }
+    int raw_nref() const { assert(_raw); return _raw->nref.read(); }
 
     void copy_out(unsigned o, unsigned l, char *dest) const {
       assert(_raw);
@@ -1178,7 +1178,7 @@ inline bool operator<=(bufferlist& l, bufferlist& r) {
 
 
 inline std::ostream& operator<<(std::ostream& out, const buffer::raw &r) {
-  return out << "buffer::raw(" << (void*)r.data << " len " << r.len << " nref " << r.nref.test() << ")";
+  return out << "buffer::raw(" << (void*)r.data << " len " << r.len << " nref " << r.nref.read() << ")";
 }
 
 inline std::ostream& operator<<(std::ostream& out, const buffer::ptr& bp) {

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index 1a27ff9a3779c3872506ecbdd8179ec9c3a69cea..536e4487b374532ea491673a82e568e0c504ca8a 100644 (file)
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -5312,7 +5312,7 @@ void MDCache::check_memory_usage()
           << ", heap " << last.get_heap()
           << ", malloc " << last.malloc << " mmap " << last.mmap
           << ", baseline " << baseline.get_heap()
-          << ", buffers " << (buffer_total_alloc.test() >> 10)
+          << ", buffers " << (buffer_total_alloc.read() >> 10)
           << ", max " << g_conf.mds_mem_max
           << ", " << num_inodes_with_caps << " / " << inode_map.size() << " inodes have caps"
           << ", " << num_caps << " caps, " << caps_per_inode << " caps per inode"

diff --git a/src/mds/MDS.cc b/src/mds/MDS.cc
index 249f1a223e6bbe4f53cfd1db00c2bf6e432496ff..bd4568ebe44d0adbb4a9ae36b26c287669196577 100644 (file)
--- a/src/mds/MDS.cc
+++ b/src/mds/MDS.cc
@@ -1550,7 +1550,7 @@ do { \
     mlogger->inc(l_mdm_capa, g_num_capa);  g_num_capa = 0;
     mlogger->inc(l_mdm_caps, g_num_caps);  g_num_caps = 0;
 
-    mlogger->set(l_mdm_buf, buffer_total_alloc.test());
+    mlogger->set(l_mdm_buf, buffer_total_alloc.read());
 
   }
 

diff --git a/src/msg/Message.h b/src/msg/Message.h
index 99b3d32afcb89e90c6bca18c3928ed11f788332f..a89fbd144399fe1ba945aed03c48b5e4e01947a0 100644 (file)
--- a/src/msg/Message.h
+++ b/src/msg/Message.h
@@ -245,7 +245,7 @@ public:
     memset(&footer, 0, sizeof(footer));
   }
   virtual ~Message() { 
-    assert(nref.test() == 0);
+    assert(nref.read() == 0);
     if (connection)
       connection->put();
   }

diff --git a/src/msg/Messenger.h b/src/msg/Messenger.h
index 0eb55a78cb992fd06380659017b1343b1071e8c3..77aa5735102b990e2bf4b63daa58a83e21e8b1de 100644 (file)
--- a/src/msg/Messenger.h
+++ b/src/msg/Messenger.h
@@ -158,7 +158,7 @@ protected:
 protected:
   //destruction should be handled via destroy()
   virtual ~Messenger() {
-    assert(nref.test() == 0);
+    assert(nref.read() == 0);
   }
 };
 

diff --git a/src/msg/SimpleMessenger.cc b/src/msg/SimpleMessenger.cc
index 2a33a315ff8d704d7202c6ac26e2660b55d20c64..8a5273599cfb370a9ac777d04bc1036d47a9bba7 100644 (file)
--- a/src/msg/SimpleMessenger.cc
+++ b/src/msg/SimpleMessenger.cc
@@ -2257,7 +2257,7 @@ void SimpleMessenger::submit_message(Message *m, const entity_inst_t& dest, bool
 {
   const entity_addr_t& dest_addr = dest.addr;
 
-  assert(m->nref.test() == 0);
+  assert(m->nref.read() == 0);
 
   // lookup
   entity_addr_t dest_proc_addr = dest_addr;

diff --git a/src/msg/SimpleMessenger.h b/src/msg/SimpleMessenger.h
index d5443373985cc2aea60b41d566db62182da91bb5..91f00d75b0cb60b4d83a9c49b02de08dd843f94b 100644 (file)
--- a/src/msg/SimpleMessenger.h
+++ b/src/msg/SimpleMessenger.h
@@ -265,7 +265,7 @@ private:
     
     void queue_received(Message *m) {
       m->set_recv_stamp(g_clock.now());
-      assert(m->nref.test() == 0);
+      assert(m->nref.read() == 0);
       queue_received(m, m->get_priority());
     }
 

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 5f96e376f4b81daf9def0be4cfa3ca8604048507..de64ba8862d8289926737a2d7b864783e12523f0 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -4025,7 +4025,7 @@ void OSD::handle_op(MOSDOp *op)
   else
     pgid = osdmap->raw_pg_to_pg(op->get_pg());
 
-  logger->set(l_osd_buf, buffer_total_alloc.test());
+  logger->set(l_osd_buf, buffer_total_alloc.read());
 
   utime_t now = g_clock.now();