From ad840edae57cd25f8a2e15f5706c114d40993212 Mon Sep 17 00:00:00 2001 From: Greg Farnum Date: Wed, 31 Mar 2010 14:09:56 -0700 Subject: [PATCH] msg: Fix a few invalid asserts. Previously, only the messenger did refcounting so any incoming messages better have nref==0. This is no longer the case, so adjust. For now, we're just making sure nref==1 to check that our conversion worked properly. --- src/msg/SimpleMessenger.cc | 5 +++-- src/msg/SimpleMessenger.h | 5 ++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/msg/SimpleMessenger.cc b/src/msg/SimpleMessenger.cc index 53ce63acc8e08..90de97e5358f1 100644 --- a/src/msg/SimpleMessenger.cc +++ b/src/msg/SimpleMessenger.cc @@ -2255,8 +2255,9 @@ 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.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! // lookup entity_addr_t dest_proc_addr = dest_addr; diff --git a/src/msg/SimpleMessenger.h b/src/msg/SimpleMessenger.h index 1eb9b62c61e18..9dce9b432de49 100644 --- a/src/msg/SimpleMessenger.h +++ b/src/msg/SimpleMessenger.h @@ -265,7 +265,10 @@ private: void queue_received(Message *m) { m->set_recv_stamp(g_clock.now()); - assert(m->nref.test() == 0); + 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! + queue_received(m, m->get_priority()); } -- 2.39.5