From e8f53fe75b5ce8a9b6f2f169f5de2af2fb4e1d84 Mon Sep 17 00:00:00 2001
From: "Peter W. Draper" <p.w.draper@durham.ac.uk>
Date: Wed, 24 May 2023 15:01:09 +0100
Subject: [PATCH] Squash some compilation issues
---
mpiuse.c | 8 ++++----
swiftmpifakestepsim.c | 2 --
swiftmpistepsim.c | 2 --
3 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/mpiuse.c b/mpiuse.c
index 8f62062..25a7070 100644
--- a/mpiuse.c
+++ b/mpiuse.c
@@ -442,11 +442,11 @@ void mpiuse_log_generate(int nr_nodes, int nr_logs, int size, int random,
*/
void mpiuse_shuffle_logs(struct mpiuse_log_entry **logs, int nlogs) {
- struct mpiuse_log_entry tmp;
+ struct mpiuse_log_entry *tmp;
for (int k = nlogs - 1; k > 0; k--) {
unsigned int j = (unsigned int)(drand48() * (k + 1));
- memcpy(&tmp, &logs[j], sizeof(struct mpiuse_log_entry *));
- memcpy(&logs[j], &logs[k], sizeof(struct mpiuse_log_entry *));
- memcpy(&logs[k], &tmp, sizeof(struct mpiuse_log_entry *));
+ tmp = logs[j];
+ logs[j] = logs[k];
+ logs[k] = tmp;
}
}
diff --git a/swiftmpifakestepsim.c b/swiftmpifakestepsim.c
index e73ab83..efc67a4 100644
--- a/swiftmpifakestepsim.c
+++ b/swiftmpifakestepsim.c
@@ -51,11 +51,9 @@ static int volatile nr_reqs = 0;
static int volatile injecting = 1;
static struct mpiuse_log_entry **volatile recvs_queue;
static int volatile nr_recvs = 0;
-static int volatile ind_recv = 0;
static int volatile todo_recv = 0;
static struct mpiuse_log_entry **volatile sends_queue;
static int volatile nr_sends = 0;
-static int volatile ind_send = 0;
static int volatile todo_send = 0;
/**
diff --git a/swiftmpistepsim.c b/swiftmpistepsim.c
index 045372e..f422101 100644
--- a/swiftmpistepsim.c
+++ b/swiftmpistepsim.c
@@ -63,11 +63,9 @@ static int volatile nr_reqs = 0;
static int volatile injecting = 1;
static struct mpiuse_log_entry **volatile recvs_queue;
static int volatile nr_recvs = 0;
-static int volatile ind_recv = 0;
static int volatile todo_recv = 0;
static struct mpiuse_log_entry **volatile sends_queue;
static int volatile nr_sends = 0;
-static int volatile ind_send = 0;
static int volatile todo_send = 0;
/* CPU frequency of the machine that created the MPI log. */
--
GitLab