From 731414b2c0f620fdfe5a49bf44f8ab735b4fdcc5 Mon Sep 17 00:00:00 2001 From: Greg Farnum Date: Thu, 15 Apr 2010 13:10:47 -0700 Subject: [PATCH] msgr: give submit_message new interface. --- src/msg/SimpleMessenger.cc | 8 ++++---- src/msg/SimpleMessenger.h | 7 ++++++- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/msg/SimpleMessenger.cc b/src/msg/SimpleMessenger.cc index e432c6ee042c3..38af3c1216092 100644 --- a/src/msg/SimpleMessenger.cc +++ b/src/msg/SimpleMessenger.cc @@ -2251,10 +2251,10 @@ bool SimpleMessenger::register_entity(entity_name_t name) return true; } -void SimpleMessenger::submit_message(Message *m, const entity_inst_t& dest, bool lazy) +void SimpleMessenger::submit_message(Message *m, Pipe **ppipe, + const entity_addr_t& dest_addr + int dest_type, bool lazy) { - const entity_addr_t& dest_addr = dest.addr; - assert(m->nref.test() == 1); //this is just to make sure that a changeset //is working properly; if you start using the refcounting more and have multiple //people hanging on to a message, ditch the assert! @@ -2300,7 +2300,7 @@ void SimpleMessenger::submit_message(Message *m, const entity_inst_t& dest, bool } else { dout(20) << "submit_message " << *m << " remote, " << dest_addr << ", new pipe." << dendl; // not connected. - pipe = connect_rank(dest_addr, dest.name.type()); + pipe = connect_rank(dest_addr, dest_type); pipe->send(m); } } diff --git a/src/msg/SimpleMessenger.h b/src/msg/SimpleMessenger.h index 657fe6b9de6d9..0123b0bc8a67f 100644 --- a/src/msg/SimpleMessenger.h +++ b/src/msg/SimpleMessenger.h @@ -526,7 +526,12 @@ public: bool register_entity(entity_name_t addr); - void submit_message(Message *m, const entity_inst_t& addr, bool lazy=false); + void submit_message(Message *m, const entity_inst_t& addr, bool lazy=false) { + submit_message(m, NULL, addr.addr, addr.name.type(), lazy); + } + void submit_message(Message *m, Pipe **ppipe, const entity_addr_t& dest_addr, + int dest_type, bool lazy=false); + int send_keepalive(const entity_inst_t& addr); void learned_addr(entity_addr_t peer_addr_for_me); -- 2.39.5