msgr: make use of references and const slightly more consistent

diff --git a/src/msg/Messenger.h b/src/msg/Messenger.h
index 82a1b1bc3f5f7b96a3281800ebf42b3816158466..6f091b8427d52097e7f17a7c1c88ff83282f5ba1 100644 (file)
--- a/src/msg/Messenger.h
+++ b/src/msg/Messenger.h
@@ -47,9 +47,6 @@ protected:
                               nref(1) {
     _my_name = w;
   }
-  virtual ~Messenger() {
-    assert(nref.test() == 0);
-  }
 
   void get() {
     nref.inc();
@@ -67,7 +64,7 @@ protected:
   virtual entity_addr_t get_myaddr() = 0;
   entity_inst_t get_myinst() { return entity_inst_t(get_myname(), get_myaddr()); }
   
-  void set_myname(entity_name_t m) { _my_name = m; }
+  void set_myname(const entity_name_t m) { _my_name = m; }
 
   void set_default_send_priority(int p) { default_send_priority = p; }
   int get_default_send_priority() { return default_send_priority; }
@@ -150,15 +147,20 @@ protected:
 
   // send message
   virtual void prepare_dest(const entity_inst_t& inst) {}
-  virtual int send_message(Message *m, entity_inst_t dest) = 0;
-  virtual int forward_message(Message *m, entity_inst_t dest) = 0;
-  virtual int lazy_send_message(Message *m, entity_inst_t dest) {
+  virtual int send_message(Message *m, const entity_inst_t& dest) = 0;
+  virtual int forward_message(Message *m, const entity_inst_t& dest) = 0;
+  virtual int lazy_send_message(Message *m, const entity_inst_t& dest) {
     return send_message(m, dest);
   }
-  virtual int send_keepalive(entity_inst_t dest) = 0;
+  virtual int send_keepalive(const entity_inst_t& dest) = 0;
 
-  virtual void mark_down(entity_addr_t a) {}
+  virtual void mark_down(const entity_addr_t& a) {}
 
+protected:
+  //destruction should be handled via destroy()
+  virtual ~Messenger() {
+    assert(nref.test() == 0);
+  }
 };
 
 

diff --git a/src/msg/SimpleMessenger.cc b/src/msg/SimpleMessenger.cc
index c04bcd8e6b670878685f8a83b3eb0c8390314375..3710392b93d7469e361e7e7359604ee68f03e1da 100644 (file)
--- a/src/msg/SimpleMessenger.cc
+++ b/src/msg/SimpleMessenger.cc
@@ -391,7 +391,7 @@ void SimpleMessenger::prepare_dest(const entity_inst_t& inst)
   lock.Unlock();
 }
 
-int SimpleMessenger::send_message(Message *m, entity_inst_t dest)
+int SimpleMessenger::send_message(Message *m, const entity_inst_t& dest)
 {
   // set envelope
   m->get_header().src = get_myinst();
@@ -410,7 +410,7 @@ int SimpleMessenger::send_message(Message *m, entity_inst_t dest)
   return 0;
 }
 
-int SimpleMessenger::forward_message(Message *m, entity_inst_t dest)
+int SimpleMessenger::forward_message(Message *m, const entity_inst_t& dest)
 {
   // set envelope
   m->get_header().src = get_myinst();
@@ -430,7 +430,7 @@ int SimpleMessenger::forward_message(Message *m, entity_inst_t dest)
 
 
 
-int SimpleMessenger::lazy_send_message(Message *m, entity_inst_t dest)
+int SimpleMessenger::lazy_send_message(Message *m, const entity_inst_t& dest)
 {
   // set envelope
   m->get_header().src = get_myinst();
@@ -2285,7 +2285,7 @@ void SimpleMessenger::submit_message(Message *m, const entity_inst_t& dest, bool
   lock.Unlock();
 }
 
-int SimpleMessenger::send_keepalive(entity_inst_t dest)
+int SimpleMessenger::send_keepalive(const entity_inst_t& dest)
 {
   const entity_addr_t dest_addr = dest.addr;
   entity_addr_t dest_proc_addr = dest_addr;

diff --git a/src/msg/SimpleMessenger.h b/src/msg/SimpleMessenger.h
index 071660294f90835ce7631da1df22947c494187ec..5e5c41aef90adf244238729e1ca8e0a3ffdd26a3 100644 (file)
--- a/src/msg/SimpleMessenger.h
+++ b/src/msg/SimpleMessenger.h
@@ -450,9 +450,9 @@ private:
   int shutdown();
   void suicide();
   void prepare_dest(const entity_inst_t& inst);
-  int send_message(Message *m, entity_inst_t dest);
-  int forward_message(Message *m, entity_inst_t dest);
-  int lazy_send_message(Message *m, entity_inst_t dest);
+  int send_message(Message *m, const entity_inst_t& dest);
+  int forward_message(Message *m, const entity_inst_t& dest);
+  int lazy_send_message(Message *m, const entity_inst_t& dest);
   /***********************/
 
 private:
@@ -507,7 +507,7 @@ public:
   bool register_entity(entity_name_t addr);
 
   void submit_message(Message *m, const entity_inst_t& addr, bool lazy=false);  
-  int send_keepalive(entity_inst_t addr);
+  int send_keepalive(const entity_inst_t& addr);
 
   void learned_addr(entity_addr_t peer_addr_for_me);