Update copyright lines with new year.

[simgrid.git] / teshsuite / smpi / macro-partial-shared-communication / macro-partial-shared-communication.c

diff --git a/teshsuite/smpi/macro-partial-shared-communication/macro-partial-shared-communication.c b/teshsuite/smpi/macro-partial-shared-communication/macro-partial-shared-communication.c
index afed268..a4088a2 100644 (file)
--- a/teshsuite/smpi/macro-partial-shared-communication/macro-partial-shared-communication.c
+++ b/teshsuite/smpi/macro-partial-shared-communication/macro-partial-shared-communication.c
@@ -1,5 +1,4 @@
-/* Copyright (c) 2009-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2017-2020. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -18,7 +17,8 @@ static void set(uint8_t *buf, size_t start, size_t stop, uint8_t value) {
 }
 
 // Return the number of times that an element is equal to (i+value)%256 between buf[start] and buf[stop-1].
-static  int count_all(uint8_t *buf, size_t start, size_t stop, uint8_t value) {
+static int count_all(const uint8_t* buf, size_t start, size_t stop, uint8_t value)
+{
   size_t occ = 0;
   for(size_t i = start ; i < stop ; i++) {
     if(buf[i] == (i+value)%256) {
@@ -29,34 +29,25 @@ static  int count_all(uint8_t *buf, size_t start, size_t stop, uint8_t value) {
 }
 
 // Return true iff the values from buf[start] to buf[stop-1] are all equal to (i+value)%256.
-static int check_all(uint8_t *buf, size_t start, size_t stop, uint8_t value) {
+static int check_all(const uint8_t* buf, size_t start, size_t stop, uint8_t value)
+{
   size_t occ = count_all(buf, start, stop, value);
   return occ == stop-start;
 }
 
-// Return true iff "enough" elements are equal to (i+value)%256 between buf[start] and buf[stop-1].
-static int check_enough(uint8_t *buf, size_t start, size_t stop, uint8_t value) {
-  int page_size = 0x1000;
-  size_t size = stop-start;
-  if(size <= 2*page_size) // we are not sure to have a whole page that is shared
-    return 1;
-  size_t occ = count_all(buf, start, stop, value);
-  return occ >= size - 2*page_size;
-}
-
 int main(int argc, char *argv[])
 {
   MPI_Init(&argc, &argv);
   int rank;
   int size;
-  size_t mem_size = 0x10000000;
+  size_t mem_size = 0x1000000;
   size_t shared_blocks[] = {
-    0,         0x1234567,
-    0x1300000, 0x1300010,
-    0x3456789, 0x3457890,
-    0x4444444, 0x5555555,
-    0x5555565, 0x5600000,
-    0x8000000, 0x10000000
+    0,         0x123456,
+    0x130000, 0x130001,
+    0x345678, 0x345789,
+    0x444444, 0x555555,
+    0x555556, 0x560000,
+    0x800000, 0x1000000
   };
   int nb_blocks = (sizeof(shared_blocks)/sizeof(size_t))/2;
   MPI_Comm_rank(MPI_COMM_WORLD, &rank);
@@ -91,7 +82,7 @@ int main(int argc, char *argv[])
       size_t start = shared_blocks[2*i+1];
       size_t stop = shared_blocks[2*i+2];
       int comm = check_all(buf, start, stop, rank-1);
-      printf("[%d] The result of the (normal) communication check for block (0x%lx, 0x%lx) is: %d\n", rank, start, stop, comm);
+      printf("[%d] The result of the (normal) communication check for block (0x%zx, 0x%zx) is: %d\n", rank, start, stop, comm);
     }
     memset(buf, rank, mem_size);
   }
@@ -101,10 +92,10 @@ int main(int argc, char *argv[])
   // Then, even processes send a sub-part of their buffer their successor
   // Note that the last block should not be copied entirely
   if(rank%2 == 0) {
-    MPI_Send(buf+0x10000, mem_size-0xa000000, MPI_UINT8_T, rank+1, 0, MPI_COMM_WORLD);
+    MPI_Send(buf+0x10000, mem_size-0xa00000, MPI_UINT8_T, rank+1, 0, MPI_COMM_WORLD);
   }
   else {
-    MPI_Recv(buf+0x10000, mem_size-0xa000000, MPI_UINT8_T, rank-1, 0, MPI_COMM_WORLD, MPI_STATUS_IGNORE);
+    MPI_Recv(buf+0x10000, mem_size-0xa00000, MPI_UINT8_T, rank-1, 0, MPI_COMM_WORLD, MPI_STATUS_IGNORE);
   }
 
 
@@ -114,7 +105,7 @@ int main(int argc, char *argv[])
       size_t start = shared_blocks[2*i+1];
       size_t stop = shared_blocks[2*i+2];
       int comm = check_all(buf, start, stop, rank-1);
-      printf("[%d] The result of the (shifted) communication check for block (0x%lx, 0x%lx) is: %d\n", rank, start, stop, comm);
+      printf("[%d] The result of the (shifted) communication check for block (0x%zx, 0x%zx) is: %d\n", rank, start, stop, comm);
     }
   }