From dbca8dae236902b5a267caa3bd3d3ff2d0e7ccd2 Mon Sep 17 00:00:00 2001 From: "Elsa Gonsiorowski (Eris)" Date: Wed, 29 Jun 2016 11:07:02 +0200 Subject: [PATCH] removed compile warnings added comments for ROSS hack: sometimes event->dest_lp is a tw_lpid (and not always an tw_lp pointer). --- io-mpi.c | 3 ++- io-serialize.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/io-mpi.c b/io-mpi.c index 4c140ef..9a4ebf0 100644 --- a/io-mpi.c +++ b/io-mpi.c @@ -217,7 +217,8 @@ void io_load_events(tw_pe * me) { me->cur_event->caused_by_me = NULL; tw_event *e = tw_eventq_pop(&g_io_buffered_events); - tw_event *n = tw_event_new(e->dest_lp, e->recv_ts, e->src_lp); + // e->dest_lp will be a GID after being loaded from checkpoint + tw_event *n = tw_event_new((tw_lpid)e->dest_lp, e->recv_ts, e->src_lp); void *emsg = tw_event_data(e); void *nmsg = tw_event_data(n); memcpy(&(n->cv), &(e->cv), sizeof(tw_bf)); diff --git a/io-serialize.c b/io-serialize.c index 896e63a..fdf2d0b 100644 --- a/io-serialize.c +++ b/io-serialize.c @@ -53,7 +53,7 @@ size_t io_event_serialize (tw_event *e, void *buffer) { io_event_store tmp; memcpy(&(tmp.cv), &(e->cv), sizeof(tw_bf)); - tmp.dest_lp = e->dest_lp; // dest_lp is gid + tmp.dest_lp = (tw_lpid)e->dest_lp; // ROSS HACK: dest_lp is gid tmp.src_lp = e->src_lp->gid; tmp.recv_ts = e->recv_ts - g_tw_ts_end; @@ -69,7 +69,7 @@ size_t io_event_deserialize (tw_event *e, void *buffer) { memcpy(&tmp, buffer, sizeof(io_event_store)); memcpy(&(e->cv), &(tmp.cv), sizeof(tw_bf)); - e->dest_lp = tmp.dest_lp; + e->dest_lp = (tw_lp *) tmp.dest_lp; // ROSS HACK: e->dest_lp is GID for a bit //undo pointer to GID conversion if (g_tw_mapping == LINEAR) { e->src_lp = g_tw_lp[((tw_lpid)tmp.src_lp) - g_tw_lp_offset];