minor set_dest_inst cleanup

git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@1128 29311d96-e01e-0410-9327-a35deaab8ce9

diff --git a/branches/riccardo/monitor2/msg/FakeMessenger.cc b/branches/riccardo/monitor2/msg/FakeMessenger.cc
index 26a9eff1d11713a124d1c72127e71b1e52242ed2..d2db8c8f7e11c55c063570169ac767a7b0c7c909 100644 (file)
--- a/branches/riccardo/monitor2/msg/FakeMessenger.cc
+++ b/branches/riccardo/monitor2/msg/FakeMessenger.cc
@@ -217,7 +217,9 @@ FakeMessenger::FakeMessenger(entity_name_t me)  : Messenger(me)
   {
     // assign rank
     _myinst.name = me;
-    _myinst.addr.nonce = nranks++;
+    _myinst.addr.port = nranks++;
+    //if (!me.is_mon())
+    //_myinst.addr.nonce = getpid();
 
     // add to directory
     directory[ _myinst.addr ] = this;
@@ -323,7 +325,7 @@ int FakeMessenger::send_message(Message *m, entity_inst_t inst, int port, int fr
           ++p) {
        dout(1) << "** have " << p->first << " to " << p->second << endl;
       }
-      assert(dm);
+      //assert(dm);
     }
     dm->queue_incoming(m);
 

diff --git a/branches/riccardo/monitor2/msg/Message.h b/branches/riccardo/monitor2/msg/Message.h
index 4df2705b3377b959c281617c223423b4f6d417f7..80e1b9feaac28064192fcdb4efb6b9ec4cefaa87 100644 (file)
--- a/branches/riccardo/monitor2/msg/Message.h
+++ b/branches/riccardo/monitor2/msg/Message.h
@@ -255,11 +255,15 @@ public:
 
   // source/dest
   entity_inst_t& get_dest_inst() { return env.dst; }
+  void set_dest_inst(entity_inst_t& inst) { env.dst = inst; }
+
   entity_inst_t& get_source_inst() { return env.src; }
+  void set_source_inst(entity_inst_t& inst) { env.src = inst; }
 
   entity_name_t& get_dest() { return env.dst.name; }
   void set_dest(entity_name_t a, int p) { env.dst.name = a; env.dest_port = p; }
   int get_dest_port() { return env.dest_port; }
+  void set_dest_port(int p) { env.dest_port = p; }
   
   entity_name_t& get_source() { return env.src.name; }
   void set_source(entity_name_t a, int p) { env.src.name = a; env.source_port = p; }

diff --git a/branches/riccardo/monitor2/msg/SimpleMessenger.cc b/branches/riccardo/monitor2/msg/SimpleMessenger.cc
index f31f8378b648720b51f83fe99c40b1cdfb0ed123..ec19e41bb45818b707e9470dc230773d0d57541b 100644 (file)
--- a/branches/riccardo/monitor2/msg/SimpleMessenger.cc
+++ b/branches/riccardo/monitor2/msg/SimpleMessenger.cc
@@ -682,7 +682,7 @@ void Rank::Pipe::fail(list<Message*>& out)
       for (list<Message*>::iterator k = j->second.begin();
            k != j->second.end();
            ++k) {
-       derr(1) << "pipe(" << peer_addr << ' ' << this << ").fail on " << **k << " to " << j->first << " inst " << peer_addr << endl;
+       derr(1) << "pipe(" << peer_addr << ' ' << this << ").fail on " << **k << " to " << (*k)->get_dest_inst() << endl;
         i->first->ms_handle_failure(*k, (*k)->get_dest_inst());
       }
 }
@@ -1111,7 +1111,8 @@ int Rank::EntityMessenger::send_message(Message *m, entity_inst_t dest,
   // set envelope
   m->set_source(get_myname(), fromport);
   m->set_source_addr(rank.my_addr);
-  m->set_dest(dest.name, port);
+  m->set_dest_inst(dest);
+  m->set_dest_port(port);
  
   dout(1) << m->get_source()
           << " --> " << dest.name << " " << dest.addr