From bab45d08f38eb97cec488de908c3e4a8dfb45d6f Mon Sep 17 00:00:00 2001 From: John Jenkins Date: Tue, 28 Apr 2015 13:34:31 -0500 Subject: [PATCH] fix to loggp latency calculation when using "receive queue" --- codes/model-net-lp.h | 1 + src/models/networks/model-net/loggp.c | 3 ++- src/models/networks/model-net/model-net-lp.c | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/codes/model-net-lp.h b/codes/model-net-lp.h index 138be65..776e199 100644 --- a/codes/model-net-lp.h +++ b/codes/model-net-lp.h @@ -68,6 +68,7 @@ void model_net_method_send_msg_recv_event( const char * category, int net_id, void * msg, + tw_stime offset, tw_lp *sender); // just need to reverse an RNG for the time being void model_net_method_send_msg_recv_event_rc(tw_lp *sender); diff --git a/src/models/networks/model-net/loggp.c b/src/models/networks/model-net/loggp.c index 5f7adcc..2d1738c 100644 --- a/src/models/networks/model-net/loggp.c +++ b/src/models/networks/model-net/loggp.c @@ -564,7 +564,8 @@ static void handle_msg_start_event( #if USE_RECV_QUEUE model_net_method_send_msg_recv_event(m->final_dest_gid, dest_id, m->src_gid, m->net_msg_size_bytes, m->is_pull, m->pull_size, - m->event_size_bytes, &m->sched_params, m->category, LOGGP, m, lp); + m->event_size_bytes, &m->sched_params, m->category, LOGGP, m, + send_queue_time, lp); #else void *m_data; // printf("\n msg start sending to %d ", dest_id); diff --git a/src/models/networks/model-net/model-net-lp.c b/src/models/networks/model-net/model-net-lp.c index f2fd510..0b93b18 100644 --- a/src/models/networks/model-net/model-net-lp.c +++ b/src/models/networks/model-net/model-net-lp.c @@ -521,9 +521,10 @@ void model_net_method_send_msg_recv_event( const char * category, int net_id, void * msg, + tw_stime offset, tw_lp *sender){ tw_event *e = - tw_event_new(dest_mn_lp, codes_local_latency(sender), sender); + tw_event_new(dest_mn_lp, offset+codes_local_latency(sender), sender); model_net_wrap_msg *m = tw_event_data(e); msg_set_header(model_net_base_magic, MN_BASE_NEW_MSG, sender->gid, &m->h); -- 2.26.2