]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
msg: Message::nref now starts at 1; remove a get() in SimpleMessenger to adjust
authorGreg Farnum <gregf@hq.newdream.net>
Wed, 31 Mar 2010 20:55:38 +0000 (13:55 -0700)
committerGreg Farnum <gregf@hq.newdream.net>
Wed, 31 Mar 2010 21:59:44 +0000 (14:59 -0700)
src/msg/Message.h
src/msg/SimpleMessenger.h

index 4f30c7ba409f4aaff7e48158651899eb6a25961d..fafed5127ac2acad5d0108b0471536d0cbf2020a 100644 (file)
@@ -231,11 +231,11 @@ protected:
 public:
   atomic_t nref;
 
-  Message() : connection(NULL), _forwarded(false), nref(0) {
+  Message() : connection(NULL), _forwarded(false), nref(1) {
     memset(&header, 0, sizeof(header));
     memset(&footer, 0, sizeof(footer));
   };
-  Message(int t) : connection(NULL), _forwarded(false), nref(0) {
+  Message(int t) : connection(NULL), _forwarded(false), nref(1) {
     memset(&header, 0, sizeof(header));
     header.type = t;
     header.version = 1;
index c751630d3760b31e71252b22f76a8e5adc7a3e0c..1eb9b62c61e18659117670adf8d96d049c021be6 100644 (file)
@@ -301,7 +301,6 @@ private:
       pipe_lock.Unlock();
     }    
     void _send(Message *m) {
-      m->get();
       out_q[m->get_priority()].push_back(m);
       cond.Signal();
     }