Commit 3467f1c6 authored by Jonathan Jenkins's avatar Jonathan Jenkins

propagate modelnet source lp through loggp

parent ae285cf3
...@@ -51,6 +51,7 @@ struct model_net_method ...@@ -51,6 +51,7 @@ struct model_net_method
tw_stime (*model_net_method_recv_msg_event)( tw_stime (*model_net_method_recv_msg_event)(
const char * category, const char * category,
tw_lpid final_dest_lp, tw_lpid final_dest_lp,
tw_lpid src_mn_lp, // the modelnet LP this message came from
uint64_t msg_size, uint64_t msg_size,
int is_pull, int is_pull,
uint64_t pull_size, uint64_t pull_size,
......
...@@ -130,6 +130,7 @@ static void loggp_packet_event_rc(tw_lp *sender); ...@@ -130,6 +130,7 @@ static void loggp_packet_event_rc(tw_lp *sender);
tw_stime loggp_recv_msg_event( tw_stime loggp_recv_msg_event(
const char * category, const char * category,
tw_lpid final_dest_lp, tw_lpid final_dest_lp,
tw_lpid src_mn_lp,
uint64_t msg_size, uint64_t msg_size,
int is_pull, int is_pull,
uint64_t pull_size, uint64_t pull_size,
...@@ -675,6 +676,7 @@ static tw_stime loggp_packet_event( ...@@ -675,6 +676,7 @@ static tw_stime loggp_packet_event(
tw_stime loggp_recv_msg_event( tw_stime loggp_recv_msg_event(
const char * category, const char * category,
tw_lpid final_dest_lp, tw_lpid final_dest_lp,
tw_lpid src_mn_lp,
uint64_t msg_size, uint64_t msg_size,
int is_pull, int is_pull,
uint64_t pull_size, uint64_t pull_size,
...@@ -695,6 +697,7 @@ tw_stime loggp_recv_msg_event( ...@@ -695,6 +697,7 @@ tw_stime loggp_recv_msg_event(
m->magic = loggp_magic; m->magic = loggp_magic;
m->event_type = LG_MSG_READY; m->event_type = LG_MSG_READY;
m->src_gid = src_lp; m->src_gid = src_lp;
m->src_mn_lp = src_mn_lp;
m->final_dest_gid = final_dest_lp; m->final_dest_gid = final_dest_lp;
m->net_msg_size_bytes = msg_size; m->net_msg_size_bytes = msg_size;
m->event_size_bytes = remote_event_size; m->event_size_bytes = remote_event_size;
......
...@@ -253,10 +253,12 @@ int fcfs_next( ...@@ -253,10 +253,12 @@ int fcfs_next(
"from %lu to %lu at %1.5e (last:%d)\n", "from %lu to %lu at %1.5e (last:%d)\n",
lp->gid, psize, q->rem, q->req.src_lp, q->req.final_dest_lp, lp->gid, psize, q->rem, q->req.src_lp, q->req.final_dest_lp,
tw_now(lp), is_last_packet); tw_now(lp), is_last_packet);
// note: we overloaded on the dest_mn_lp field - it's the dest of the
// soruce in the case of a pull
*poffset = s->method->model_net_method_recv_msg_event(q->req.category, *poffset = s->method->model_net_method_recv_msg_event(q->req.category,
q->req.final_dest_lp, psize, q->req.is_pull, q->req.msg_size, q->req.final_dest_lp, q->req.dest_mn_lp, psize,
0.0, q->req.remote_event_size, q->remote_event, q->req.src_lp, q->req.is_pull, q->req.msg_size, 0.0, q->req.remote_event_size,
lp); q->remote_event, q->req.src_lp, lp);
} }
else{ else{
dprintf("%lu (mn): issuing packet of size %lu (of %lu) " dprintf("%lu (mn): issuing packet of size %lu (of %lu) "
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment