From 5306977d5e45882e1e36c61163f196bae140329e Mon Sep 17 00:00:00 2001
From: "Peter W. Draper" <p.w.draper@durham.ac.uk>
Date: Mon, 24 Apr 2023 13:17:24 +0100
Subject: [PATCH] Formatting

---
 Makefile                         |  7 ++--
 histogram.c                      |  4 +--
 infinity_wrapper.c               | 61 ++++++++++++++++----------------
 mpiuse.c                         |  3 +-
 swiftmpirdmaonestepsim.c         | 13 ++++---
 swiftmpirdmaonestepsim2.c        | 13 ++++---
 swiftmpirdmaonestepsim_wrapper.c | 14 +++-----
 swiftmpirdmastepsim.c            | 13 ++++---
 swiftmpirdmastepsim2.c           | 13 ++++---
 swiftmpirdmastepsim3.c           | 13 ++++---
 swiftmpistepsim.c                | 14 +++-----
 11 files changed, 76 insertions(+), 92 deletions(-)

diff --git a/Makefile b/Makefile
index fb09283..439c6bc 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
-CFLAGS = -g -O0 -Wall -Iinfinity/include -fsanitize=address -fno-omit-frame-pointer -fsanitize=undefined -DINFINITY_DEBUG_ON -DINFINITY_ASSERT_ON
-#CFLAGS = -g -O3 -Wall -Iinfinity/include
+#CFLAGS = -g -O0 -Wall -Iinfinity/include -fsanitize=address -fno-omit-frame-pointer -fsanitize=undefined -DINFINITY_DEBUG_ON -DINFINITY_ASSERT_ON
+CFLAGS = -g -O3 -Wall -Iinfinity/include
 #CFLAGS = -g -O3 -Wall -Iinfinity/include -DINFINITY_DEBUG_ON -DINFINITY_ASSERT_ON
 #CFLAGS = -g -O0 -Wall -Iinfinity/include -fsanitize=thread
 
@@ -20,9 +20,6 @@ swiftmpistepsim: swiftmpistepsim.c $(SRC) $(INC) $(DEPS)
 swiftmpifakestepsim: swiftmpifakestepsim.c $(SRC) $(INC) $(DEPS)
 	mpicc $(CFLAGS) -o swiftmpifakestepsim swiftmpifakestepsim.c $(SRC) -lpthread -lm
 
-swiftmpistepsim: swiftmpistepsim.c  $(DEPS)
-	mpicxx $(CFLAGS) -o swiftmpistepsim swiftmpistepsim.c $(SRC)
-
 swiftmpistepsim2: swiftmpistepsim2.c  $(DEPS)
 	mpicxx $(CFLAGS) -o swiftmpistepsim2 swiftmpistepsim2.c $(SRC)
 
diff --git a/histogram.c b/histogram.c
index d9b1609..b86ebac 100644
--- a/histogram.c
+++ b/histogram.c
@@ -107,7 +107,7 @@ int histread(const char *file, double **values, int *nvalues) {
   /* Initial space for data. */
   int nvals = 0;
   int maxvals = 1024;
-  double *vals = malloc(maxvals * sizeof(double));
+  double *vals = (double *)malloc(maxvals * sizeof(double));
 
   char line[132];
   while (!feof(infile)) {
@@ -125,7 +125,7 @@ int histread(const char *file, double **values, int *nvalues) {
         /* Make more space. */
         if (nvals > maxvals) {
           maxvals += 1024;
-          vals = realloc(vals, maxvals * sizeof(double));
+          vals = (double *)realloc(vals, maxvals * sizeof(double));
         }
       }
     }
diff --git a/infinity_wrapper.c b/infinity_wrapper.c
index 105a476..ac266da 100644
--- a/infinity_wrapper.c
+++ b/infinity_wrapper.c
@@ -117,13 +117,13 @@ void *infinity_connect_clients(struct mpi_servers *servers, int nr_servers,
   cqps->factory = new infinity::queues::QueuePairFactory(cqps->context);
 
   /* Create the QPs connecting to all the other ranks. */
-  cqps->qps = (infinity::queues::QueuePair **)
-    calloc(nr_servers, sizeof(infinity::queues::QueuePair *));
+  cqps->qps = (infinity::queues::QueuePair **)calloc(
+      nr_servers, sizeof(infinity::queues::QueuePair *));
   cqps->nr_qps = nr_servers;
 
   /* Space for the pointers to the remote memory. */
-  cqps->remote_buffers = (infinity::memory::RegionToken **)
-    calloc(nr_servers, sizeof(infinity::memory::RegionToken *));
+  cqps->remote_buffers = (infinity::memory::RegionToken **)calloc(
+      nr_servers, sizeof(infinity::memory::RegionToken *));
 
   /* We need to listen for messages from the other rank servers that we can
    * connect to them as they need to be up first. */
@@ -151,14 +151,15 @@ void *infinity_connect_clients(struct mpi_servers *servers, int nr_servers,
     if (verbose)
       message("%d waiting for connection to remote server %s %d on %d", myrank,
               ip, index, BASE_PORT + myrank);
-    cqps->qps[index] = cqps->factory->connectToRemoteHost(ip, BASE_PORT + myrank);
+    cqps->qps[index] =
+        cqps->factory->connectToRemoteHost(ip, BASE_PORT + myrank);
     if (verbose)
       message("%d connected to remote server %s %d on %d", myrank, ip, index,
               BASE_PORT + myrank);
 
     /* Remote buffer access */
     cqps->remote_buffers[index] =
-      (infinity::memory::RegionToken *)cqps->qps[index]->getUserData();
+        (infinity::memory::RegionToken *)cqps->qps[index]->getUserData();
   }
 
   /* Result is opaque. */
@@ -185,30 +186,27 @@ void infinity_send_data(void *qphandle, int index, void *buffer, size_t size,
 
   /* Need to assign to a buffer to register memory. XXX make this as big as
    * necessary per server and reuse. */
-  auto *sendBuffer =
-    new infinity::memory::Buffer(cqps->context, buffer, size);
+  auto *sendBuffer = new infinity::memory::Buffer(cqps->context, buffer, size);
 
   /* And send. */
   infinity::requests::RequestToken requestToken(cqps->context);
   cqps->qps[index]->write(sendBuffer,
-                          0,                           // localOffset
-                          cqps->remote_buffers[index], // destination
-                          offset,                      // remoteOffset
-                          size,                        // sizeInBytes
-                          infinity::queues::OperationFlags(),
-                          &requestToken);
+                          0,                            // localOffset
+                          cqps->remote_buffers[index],  // destination
+                          offset,                       // remoteOffset
+                          size,                         // sizeInBytes
+                          infinity::queues::OperationFlags(), &requestToken);
   requestToken.waitUntilCompleted();
   requestToken.reset();
 
   /* Now we update the unlock field. */
   ((BLOCKTYPE *)sendBuffer->getData())[0] = UNLOCKED;
   cqps->qps[index]->write(sendBuffer,
-                          0,                           // localOffset
-                          cqps->remote_buffers[index], // destination
-                          offset,                      // remoteOffset
-                          BYTESINBLOCK,                // sizeInBytes
-                          infinity::queues::OperationFlags(),
-                          &requestToken);
+                          0,                            // localOffset
+                          cqps->remote_buffers[index],  // destination
+                          offset,                       // remoteOffset
+                          BYTESINBLOCK,                 // sizeInBytes
+                          infinity::queues::OperationFlags(), &requestToken);
   requestToken.waitUntilCompleted();  // Since we reuse the sendBuffer.
 
   delete sendBuffer;
@@ -271,24 +269,24 @@ void *infinity_create_servers(struct mpi_servers *servers, int nr_servers,
   cqps->factory = new infinity::queues::QueuePairFactory(cqps->context);
 
   /* Create the QPs connecting to all the other ranks. */
-  cqps->qps = (infinity::queues::QueuePair **)
-    calloc(nr_servers, sizeof(infinity::queues::QueuePair *));
+  cqps->qps = (infinity::queues::QueuePair **)calloc(
+      nr_servers, sizeof(infinity::queues::QueuePair *));
   cqps->nr_qps = nr_servers;
 
   /* Create buffers to receive all the remote data. */
-  cqps->readwrite_buffers = (infinity::memory::Buffer **)
-    calloc(nr_servers, sizeof(infinity::memory::Buffer *));
-  cqps->token_buffers = (infinity::memory::RegionToken **)
-    calloc(nr_servers, sizeof(infinity::memory::RegionToken *));
+  cqps->readwrite_buffers = (infinity::memory::Buffer **)calloc(
+      nr_servers, sizeof(infinity::memory::Buffer *));
+  cqps->token_buffers = (infinity::memory::RegionToken **)calloc(
+      nr_servers, sizeof(infinity::memory::RegionToken *));
 
   for (int k = 0; k < nr_servers; k++) {
     if (sizes[k] > 0) {
       cqps->readwrite_buffers[k] =
-        new infinity::memory::Buffer(cqps->context, sizes[k]);
+          new infinity::memory::Buffer(cqps->context, sizes[k]);
     } else {
       /* Dummy: not expecting any data, but setup anyway. */
       cqps->readwrite_buffers[k] =
-        new infinity::memory::Buffer(cqps->context, BYTESINBLOCK);
+          new infinity::memory::Buffer(cqps->context, BYTESINBLOCK);
     }
     cqps->token_buffers[k] = cqps->readwrite_buffers[k]->createRegionToken();
   }
@@ -305,8 +303,8 @@ void *infinity_create_servers(struct mpi_servers *servers, int nr_servers,
       /* Send message this port is about to block for a connection. */
       if (verbose) message("Blocking for first message on %d", BASE_PORT + k);
       MPI_Isend(buf, 1, MPI_INT, k, myrank, MPI_COMM_WORLD, &req);
-      cqps->qps[k] = cqps->factory->acceptIncomingConnection
-        (cqps->token_buffers[k], sizeof(infinity::memory::RegionToken));
+      cqps->qps[k] = cqps->factory->acceptIncomingConnection(
+          cqps->token_buffers[k], sizeof(infinity::memory::RegionToken));
       if (verbose)
         message("Accepting incoming connections on %d", BASE_PORT + k);
     }
@@ -335,7 +333,8 @@ void *infinity_check_ready(void *qphandle, int index, size_t offset) {
   struct qps_data *cqps = (struct qps_data *)qphandle;
 
   /* Get the data location. */
-  BLOCKTYPE *dataptr = &((BLOCKTYPE *)cqps->readwrite_buffers[index]->getData())[offset];
+  BLOCKTYPE *dataptr =
+      &((BLOCKTYPE *)cqps->readwrite_buffers[index]->getData())[offset];
 
   /* Check if this has been unlocked. */
   BLOCKTYPE volatile lock = dataptr[0];
diff --git a/mpiuse.c b/mpiuse.c
index caf999f..de72404 100644
--- a/mpiuse.c
+++ b/mpiuse.c
@@ -336,7 +336,8 @@ void mpiuse_log_generate(int nr_nodes, int nr_logs, int size, int random,
     int nvalues;
     if (histread(odata, &values, &nvalues)) {
       // printf("## Read %d occurence values from %s\n", nvalues, odata);
-      struct histogram *h = calloc(1, sizeof(struct histogram));
+      struct histogram *h =
+          (struct histogram *)calloc(1, sizeof(struct histogram));
       histmake(nvalues, values, h);
       // printf("## Created cumulative histogram with %d values:\n",
       // h->nvalues);  printf("# value sum\n");
diff --git a/swiftmpirdmaonestepsim.c b/swiftmpirdmaonestepsim.c
index a1294d2..ea55948 100644
--- a/swiftmpirdmaonestepsim.c
+++ b/swiftmpirdmaonestepsim.c
@@ -21,6 +21,12 @@
 // Write variant, attempting to use eager-like one-sided sends.
 
 #include <arpa/inet.h>
+#include <infinity/core/Context.h>
+#include <infinity/memory/Buffer.h>
+#include <infinity/memory/RegionToken.h>
+#include <infinity/queues/QueuePair.h>
+#include <infinity/queues/QueuePairFactory.h>
+#include <infinity/requests/RequestToken.h>
 #include <limits.h>
 #include <mpi.h>
 #include <netdb.h>
@@ -30,13 +36,6 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <infinity/core/Context.h>
-#include <infinity/memory/Buffer.h>
-#include <infinity/memory/RegionToken.h>
-#include <infinity/queues/QueuePair.h>
-#include <infinity/queues/QueuePairFactory.h>
-#include <infinity/requests/RequestToken.h>
-
 #include "atomic.h"
 #include "clocks.h"
 #include "error.h"
diff --git a/swiftmpirdmaonestepsim2.c b/swiftmpirdmaonestepsim2.c
index 5799992..4c62279 100644
--- a/swiftmpirdmaonestepsim2.c
+++ b/swiftmpirdmaonestepsim2.c
@@ -22,6 +22,12 @@
 // Variation has a single send and receive thread per rank.
 
 #include <arpa/inet.h>
+#include <infinity/core/Context.h>
+#include <infinity/memory/Buffer.h>
+#include <infinity/memory/RegionToken.h>
+#include <infinity/queues/QueuePair.h>
+#include <infinity/queues/QueuePairFactory.h>
+#include <infinity/requests/RequestToken.h>
 #include <limits.h>
 #include <mpi.h>
 #include <netdb.h>
@@ -31,13 +37,6 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <infinity/core/Context.h>
-#include <infinity/memory/Buffer.h>
-#include <infinity/memory/RegionToken.h>
-#include <infinity/queues/QueuePair.h>
-#include <infinity/queues/QueuePairFactory.h>
-#include <infinity/requests/RequestToken.h>
-
 #include "atomic.h"
 #include "clocks.h"
 #include "error.h"
diff --git a/swiftmpirdmaonestepsim_wrapper.c b/swiftmpirdmaonestepsim_wrapper.c
index 9fd9a49..96dfef4 100644
--- a/swiftmpirdmaonestepsim_wrapper.c
+++ b/swiftmpirdmaonestepsim_wrapper.c
@@ -31,11 +31,10 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "infinity_wrapper.h"
-
 #include "atomic.h"
 #include "clocks.h"
 #include "error.h"
+#include "infinity_wrapper.h"
 #include "mpiuse.h"
 
 /* Our rank for all to see. */
@@ -205,8 +204,7 @@ static void *send_thread(void *arg) {
 
   // Connect QPs to the remote servers.
   struct mpi_servers *servers = (struct mpi_servers *)arg;
-  void *qphandle = infinity_connect_clients(servers, nr_ranks,
-                                            myrank, 0);
+  void *qphandle = infinity_connect_clients(servers, nr_ranks, myrank, 0);
 
   /* Extract the offset lists that we use. */
   int nr = 0;
@@ -319,8 +317,7 @@ static void *recv_thread(void *arg) {
   for (int k = 0; k < nr_ranks; k++) {
     sizes[k] = tobytes(ranktag_sizes[k]);
   }
-  void *qphandle = infinity_create_servers(servers, nr_ranks, sizes,
-                                           myrank, 0);
+  void *qphandle = infinity_create_servers(servers, nr_ranks, sizes, myrank, 0);
   free(sizes);
   message("All incomings up");
 
@@ -346,9 +343,8 @@ static void *recv_thread(void *arg) {
       if (log->injtic == 0) log->injtic = getticks();
 
       /* Check if data has arrived. */
-      BLOCKTYPE *dataptr = (BLOCKTYPE *)infinity_check_ready(qphandle,
-                                                             log->otherrank,
-                                                             log->offset);
+      BLOCKTYPE *dataptr = (BLOCKTYPE *)infinity_check_ready(
+          qphandle, log->otherrank, log->offset);
       if (dataptr != NULL) {
         // XXX should check these for correctness.
         // int subtype = dataptr[1];
diff --git a/swiftmpirdmastepsim.c b/swiftmpirdmastepsim.c
index dacd35d..fada2ee 100644
--- a/swiftmpirdmastepsim.c
+++ b/swiftmpirdmastepsim.c
@@ -20,6 +20,12 @@
 // Pure RDMA version, we use MPI for process control and synchronization.
 
 #include <arpa/inet.h>
+#include <infinity/core/Context.h>
+#include <infinity/memory/Buffer.h>
+#include <infinity/memory/RegionToken.h>
+#include <infinity/queues/QueuePair.h>
+#include <infinity/queues/QueuePairFactory.h>
+#include <infinity/requests/RequestToken.h>
 #include <limits.h>
 #include <mpi.h>
 #include <netdb.h>
@@ -29,13 +35,6 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <infinity/core/Context.h>
-#include <infinity/memory/Buffer.h>
-#include <infinity/memory/RegionToken.h>
-#include <infinity/queues/QueuePair.h>
-#include <infinity/queues/QueuePairFactory.h>
-#include <infinity/requests/RequestToken.h>
-
 #include "atomic.h"
 #include "clocks.h"
 #include "error.h"
diff --git a/swiftmpirdmastepsim2.c b/swiftmpirdmastepsim2.c
index db91e13..20bbaa5 100644
--- a/swiftmpirdmastepsim2.c
+++ b/swiftmpirdmastepsim2.c
@@ -21,6 +21,12 @@
 // Variation uses one sending thread and nranks receiving threads per rank.
 
 #include <arpa/inet.h>
+#include <infinity/core/Context.h>
+#include <infinity/memory/Buffer.h>
+#include <infinity/memory/RegionToken.h>
+#include <infinity/queues/QueuePair.h>
+#include <infinity/queues/QueuePairFactory.h>
+#include <infinity/requests/RequestToken.h>
 #include <limits.h>
 #include <mpi.h>
 #include <netdb.h>
@@ -30,13 +36,6 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <infinity/core/Context.h>
-#include <infinity/memory/Buffer.h>
-#include <infinity/memory/RegionToken.h>
-#include <infinity/queues/QueuePair.h>
-#include <infinity/queues/QueuePairFactory.h>
-#include <infinity/requests/RequestToken.h>
-
 #include "atomic.h"
 #include "clocks.h"
 #include "error.h"
diff --git a/swiftmpirdmastepsim3.c b/swiftmpirdmastepsim3.c
index 0313506..ccda5c2 100644
--- a/swiftmpirdmastepsim3.c
+++ b/swiftmpirdmastepsim3.c
@@ -21,6 +21,12 @@
 // Variation uses one sending thread and one receiving thread per rank.
 
 #include <arpa/inet.h>
+#include <infinity/core/Context.h>
+#include <infinity/memory/Buffer.h>
+#include <infinity/memory/RegionToken.h>
+#include <infinity/queues/QueuePair.h>
+#include <infinity/queues/QueuePairFactory.h>
+#include <infinity/requests/RequestToken.h>
 #include <limits.h>
 #include <mpi.h>
 #include <netdb.h>
@@ -30,13 +36,6 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <infinity/core/Context.h>
-#include <infinity/memory/Buffer.h>
-#include <infinity/memory/RegionToken.h>
-#include <infinity/queues/QueuePair.h>
-#include <infinity/queues/QueuePairFactory.h>
-#include <infinity/requests/RequestToken.h>
-
 #include "atomic.h"
 #include "clocks.h"
 #include "error.h"
diff --git a/swiftmpistepsim.c b/swiftmpistepsim.c
index 398af5b..715ea7b 100644
--- a/swiftmpistepsim.c
+++ b/swiftmpistepsim.c
@@ -35,9 +35,6 @@ int myrank = -1;
 /* Are we verbose. */
 static int verbose = 0;
 
-/* Scale to apply to the size of the messages we send. */
-static float messagescale = 1.0;
-
 /* Attempt to keep original injection time differences. */
 static int usetics = 1;
 
@@ -397,7 +394,7 @@ static void pick_logs(void) {
         if (messagesize > 0) log->size = messagesize;
 
         /* Scale size. */
-        log->size *= messagescale ;
+        log->size *= messagescale;
 
         /* And keep this log. */
         log->data = NULL;
@@ -428,9 +425,11 @@ static void pick_logs(void) {
  * @brief usage help.
  */
 static void usage(char *argv[]) {
-  fprintf(stderr, "Usage: %s [-vfdc:s:] SWIFT_mpiuse-log-file.dat logfile.dat\n",
+  fprintf(stderr,
+          "Usage: %s [-vfdc:s:] SWIFT_mpiuse-log-file.dat logfile.dat\n",
           argv[0]);
-  fprintf(stderr, " options: -v verbose, -f fast injections, "
+  fprintf(stderr,
+          " options: -v verbose, -f fast injections, "
           "-d fill messages and check values on receive, "
           "-s <value> use fixed message of this size (bytes), "
           "-c <value> scale factor for all messages\n");
@@ -467,9 +466,6 @@ int main(int argc, char *argv[]) {
       case 'f':
         usetics = 0;
         break;
-      case 's':
-        messagescale = atof(optarg);
-        break;
       case 'v':
         verbose = 1;
         break;
-- 
GitLab