diff --git a/swiftmpistepsim.c b/swiftmpistepsim.c index 5df26b591507604085fae6bfc1e8ef60243dbfd9..0aa877eca9da1b3bbf8f9b8cff90f73261ef282a 100644 --- a/swiftmpistepsim.c +++ b/swiftmpistepsim.c @@ -127,6 +127,7 @@ static void *inject_thread(void *arg) { /* Differences to SWIFT: MPI_BYTE not the MPI_Type. */ int err = 0; if (log->type == task_type_send) { + log->data = calloc(log->size, 1); err = MPI_Isend(log->data, log->size, MPI_BYTE, log->otherrank, log->tag, subtypeMPI_comms[log->subtype], &log->req); @@ -136,6 +137,7 @@ static void *inject_thread(void *arg) { atomic_inc(&todo_send); } else { + log->data = calloc(log->size, 1); err = MPI_Irecv(log->data, log->size, MPI_BYTE, log->otherrank, log->tag, subtypeMPI_comms[log->subtype], &log->req); @@ -327,7 +329,7 @@ static void pick_logs(void) { nlogs, sizeof(struct mpiuse_log_entry *)); nr_reqs = 0; sends_queue = (struct mpiuse_log_entry **)calloc( - nlogs, sizeof(struct mpiuse_log_entry *) * nlogs); + nlogs, sizeof(struct mpiuse_log_entry *)); nr_sends = 0; recvs_queue = (struct mpiuse_log_entry **)calloc( nlogs, sizeof(struct mpiuse_log_entry *)); @@ -338,10 +340,8 @@ static void pick_logs(void) { if (log->rank == myrank && log->activation) { if (log->type == task_type_send || log->type == task_type_recv) { - /* Allocate space for data. */ - log->data = calloc(log->size, 1); - /* And keep this log. */ + log->data = NULL; reqs_queue[nr_reqs] = log; nr_reqs++;