extra cleanups in Storage

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

diff --git a/teshsuite/smpi/macro-partial-shared/macro-partial-shared.c b/teshsuite/smpi/macro-partial-shared/macro-partial-shared.c
index 18aafd8..208e04d 100644 (file)
--- a/teshsuite/smpi/macro-partial-shared/macro-partial-shared.c
+++ b/teshsuite/smpi/macro-partial-shared/macro-partial-shared.c
@@ -1,5 +1,4 @@
-/* Copyright (c) 2009-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2017-2018. 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. */
 
 /* 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. */


@@ -10,14 +9,14 @@
 #include <inttypes.h>
 
 // Set the elements between buf[start] and buf[stop-1] to (i+value)%256
 #include <inttypes.h>
 
 // Set the elements between buf[start] and buf[stop-1] to (i+value)%256

-void set(uint8_t *buf, size_t start, size_t stop, uint8_t value) {
+static void set(uint8_t *buf, size_t start, size_t stop, uint8_t value) {

   for(size_t i = start; i < stop; i++) {
     buf[i] = (i+value)%256;
   }
 }
 
 // Return the number of times that an element is equal to (i+value)%256 between buf[start] and buf[stop-1].
   for(size_t i = start; i < stop; i++) {
     buf[i] = (i+value)%256;
   }
 }
 
 // Return the number of times that an element is equal to (i+value)%256 between buf[start] and buf[stop-1].

-int count_all(uint8_t *buf, size_t start, size_t stop, uint8_t value) {
+static int count_all(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) {
   size_t occ = 0;
   for(size_t i = start ; i < stop ; i++) {
     if(buf[i] == (i+value)%256) {


@@ -28,13 +27,13 @@ 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.
 }
 
 // Return true iff the values from buf[start] to buf[stop-1] are all equal to (i+value)%256.

-int check_all(uint8_t *buf, size_t start, size_t stop, uint8_t value) {
+static int check_all(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].
   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].

-int check_enough(uint8_t *buf, size_t start, size_t stop, uint8_t value) {
+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
   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


@@ -48,14 +47,14 @@ int main(int argc, char *argv[])
   MPI_Init(&argc, &argv);
   int rank;
   int size;
   MPI_Init(&argc, &argv);
   int rank;
   int size;

-  size_t mem_size = 0x10000000;
+  size_t mem_size = 0x1000000;

   size_t shared_blocks[] = {
   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);
   };
   int nb_blocks = (sizeof(shared_blocks)/sizeof(size_t))/2;
   MPI_Comm_rank(MPI_COMM_WORLD, &rank);


@@ -80,7 +79,7 @@ int main(int argc, char *argv[])
     size_t start = shared_blocks[2*i];
     size_t stop = shared_blocks[2*i+1];
     int is_shared = check_enough(buf, start, stop, 42);
     size_t start = shared_blocks[2*i];
     size_t stop = shared_blocks[2*i+1];
     int is_shared = check_enough(buf, start, stop, 42);

-    printf("[%d] The result of the shared check for block (0x%lx, 0x%lx) is: %d\n", rank, start, stop, is_shared);
+    printf("[%d] The result of the shared check for block (0x%zx, 0x%zx) is: %d\n", rank, start, stop, is_shared);

   }
 
 
   }
 
 


@@ -90,7 +89,7 @@ int main(int argc, char *argv[])
     size_t start = shared_blocks[2*i+1];
     size_t stop = shared_blocks[2*i+2];
     int is_private = check_all(buf, start, stop, 0);
     size_t start = shared_blocks[2*i+1];
     size_t stop = shared_blocks[2*i+2];
     int is_private = check_all(buf, start, stop, 0);

-    printf("[%d] The result of the private check for block (0x%lx, 0x%lx) is: %d\n", rank, start, stop, is_private);
+    printf("[%d] The result of the private check for block (0x%zx, 0x%zx) is: %d\n", rank, start, stop, is_private);

   }
 
   SMPI_SHARED_FREE(buf);
   }
 
   SMPI_SHARED_FREE(buf);