Skip to content
This repository was archived by the owner on Jan 19, 2019. It is now read-only.

Commit dbca8da

Browse files
committed
removed compile warnings
added comments for ROSS hack: sometimes event->dest_lp is a tw_lpid (and not always an tw_lp pointer).
1 parent 9f6ee39 commit dbca8da

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

io-mpi.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,8 @@ void io_load_events(tw_pe * me) {
217217
me->cur_event->caused_by_me = NULL;
218218

219219
tw_event *e = tw_eventq_pop(&g_io_buffered_events);
220-
tw_event *n = tw_event_new(e->dest_lp, e->recv_ts, e->src_lp);
220+
// e->dest_lp will be a GID after being loaded from checkpoint
221+
tw_event *n = tw_event_new((tw_lpid)e->dest_lp, e->recv_ts, e->src_lp);
221222
void *emsg = tw_event_data(e);
222223
void *nmsg = tw_event_data(n);
223224
memcpy(&(n->cv), &(e->cv), sizeof(tw_bf));

io-serialize.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ size_t io_event_serialize (tw_event *e, void *buffer) {
5353
io_event_store tmp;
5454

5555
memcpy(&(tmp.cv), &(e->cv), sizeof(tw_bf));
56-
tmp.dest_lp = e->dest_lp; // dest_lp is gid
56+
tmp.dest_lp = (tw_lpid)e->dest_lp; // ROSS HACK: dest_lp is gid
5757
tmp.src_lp = e->src_lp->gid;
5858
tmp.recv_ts = e->recv_ts - g_tw_ts_end;
5959

@@ -69,7 +69,7 @@ size_t io_event_deserialize (tw_event *e, void *buffer) {
6969
memcpy(&tmp, buffer, sizeof(io_event_store));
7070

7171
memcpy(&(e->cv), &(tmp.cv), sizeof(tw_bf));
72-
e->dest_lp = tmp.dest_lp;
72+
e->dest_lp = (tw_lp *) tmp.dest_lp; // ROSS HACK: e->dest_lp is GID for a bit
7373
//undo pointer to GID conversion
7474
if (g_tw_mapping == LINEAR) {
7575
e->src_lp = g_tw_lp[((tw_lpid)tmp.src_lp) - g_tw_lp_offset];

0 commit comments

Comments
 (0)